nilsteampassnet / TeamPass

sources/logs.datatables.php

Spacing +9 added lines, -10 removed lines

@@ -70,7 +70,7 @@ 
 ) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -908,15 +908,15 @@ 
         //col1
         $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
-        $sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
+        $sOutput .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
         //col4
         $sOutput .= '"'.$record['process_type'].'", ';
         // col5
         if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
             $data_user = DB::queryfirstrow(
-                'SELECT name, lastname FROM ' . prefixTable('users') . '
+                'SELECT name, lastname FROM '.prefixTable('users').'
                 WHERE id = %i',
                 json_decode($record['arguments'], true)['new_user_id']
             );
@@ -999,13 +999,12 @@ 
         //col1
         $sOutput .= '"", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         $sOutput .= is_null($record['started_at']) === false ?
-            ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
-                ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
+            ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
         //col4
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", ';
         // col7
         $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
         //col5
@@ -1023,7 +1022,7 @@ 
         $newUserId = json_decode($record['arguments'], true)['new_user_id'];
         if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
             $data_user = DB::queryfirstrow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $newUserId
             );
@@ -1039,7 +1038,7 @@ 
         } elseif ($record['process_type'] === 'user_build_cache_tree') {
             $user = json_decode($record['arguments'], true)['user_id'];
             $data_user = DB::queryfirstrow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $user
             );

sources/tasks.queries.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
 ) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -138,7 +138,7 @@ 
     // get exec from processes table
     $rows = DB::query(
         'SELECT max(finished_at), process_type
-        FROM ' . prefixTable('processes') . '
+        FROM ' . prefixTable('processes').'
         GROUP BY process_type'
     );
     foreach ($rows as $row) {
@@ -154,7 +154,7 @@ 
     // get exec from processes_log table
     $rows = DB::query(
         'SELECT max(finished_at), job as process_type
-        FROM ' . prefixTable('processes_logs') . '
+        FROM ' . prefixTable('processes_logs').'
         GROUP BY process_type'
     );
     foreach ($rows as $row) {

sources/main.queries.php

Spacing +93 added lines, -93 removed lines

@@ -125,7 +125,7 @@ 
     error_reporting(E_ERROR);
 
     // Includes
-    include_once __DIR__.'/../includes/language/' . $_SESSION['user']['user_language'] . '.php';
+    include_once __DIR__.'/../includes/language/'.$_SESSION['user']['user_language'].'.php';
     include_once __DIR__.'/../sources/main.functions.php';
 
     // Load libraries
@@ -532,7 +532,7 @@ 
             $pwdlib = new PasswordLib();
             // generate key
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
-            return '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
+            return '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
 
         /*
         * Launch user keys change on his demand
@@ -685,7 +685,7 @@ 
                 )
             );
 
-            return '[{"token" : "' . $token . '"}]';
+            return '[{"token" : "'.$token.'"}]';
 
         /*
         * Default case
@@ -742,7 +742,7 @@ 
         array(
             'error' => false,
             'timestamp' => $_SESSION['sessionDuration'],
-            'max_time_to_add' => intdiv((($maximum_session_expiration_time*60) - ((int) $_SESSION['sessionDuration'] - time())), 60),
+            'max_time_to_add' => intdiv((($maximum_session_expiration_time * 60) - ((int) $_SESSION['sessionDuration'] - time())), 60),
             'max_session_duration' => $maximum_session_expiration_time,
         ),
         'encode'
@@ -794,7 +794,7 @@ 
     // get number of items
     DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('sharekeys_items') .
+        FROM ' . prefixTable('sharekeys_items').
         ' WHERE user_id = %i',
         $userId
     );
@@ -846,7 +846,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('users') . ' WHERE id = %i',
+            FROM ' . prefixTable('users').' WHERE id = %i',
             $post_user_id
         );
 
@@ -867,8 +867,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -881,8 +881,8 @@ 
             return prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -983,14 +983,14 @@ 
         // Get data about user
         $data = DB::queryfirstrow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $data = DB::queryfirstrow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -1081,7 +1081,7 @@ 
                 'email' => $data['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
                     addslashes(langHdl('admin_email_result_ok'))
                 ),
             ),
@@ -1097,7 +1097,7 @@ 
             'email' => $data['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
+                '<b>'.obfuscateEmail($data['email']).'</b>',
                 addslashes(langHdl('admin_email_result_ok'))
             ),
         ),
@@ -1111,7 +1111,7 @@ 
 {
     if (isKeyExistingAndEqual('enable_send_email_on_user_login', 1, $SETTINGS) === true) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -1119,7 +1119,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
@@ -1215,8 +1215,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         '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
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -1248,7 +1248,7 @@ 
     if (isKeyExistingAndEqual('enable_suggestion', 1, $SETTINGS) === true
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1282,13 +1282,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1374,8 +1374,8 @@ 
                 $url_found = substr($line, 19, strlen($line) - 22);
                 if (empty($url_found) === false) {
                     $tmp = parse_url($url_found);
-                    $anonym_url = $tmp['scheme'] . '://<anonym_url>' . (isset($tmp['path']) === true ? $tmp['path'] : '');
-                    $line = "'cpassman_url' => '" . $anonym_url . "\n";
+                    $anonym_url = $tmp['scheme'].'://<anonym_url>'.(isset($tmp['path']) === true ? $tmp['path'] : '');
+                    $line = "'cpassman_url' => '".$anonym_url."\n";
                 } else {
                     $line = "'cpassman_url' => \n";
                 }
@@ -1405,7 +1405,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1413,9 +1413,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1424,7 +1424,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $data['current_page'] . '
+' . $data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1439,39 +1439,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION . '
+**Teampass version:** ' . TP_VERSION.'
 
 **Teampass configuration file:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $data['browser_name'] . ' - ' . $data['browser_version'] . '
+**Browser:** ' . $data['browser_name'].' - '.$data['browser_version'].'
 
-**Operating system:** ' . $data['os'] . ' - ' . $data['os_archi'] . 'bits
+**Operating system:** ' . $data['os'].' - '.$data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1507,7 +1507,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw, auth_type
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1516,9 +1516,9 @@ 
             // Get one item
             $currentUserKey = DB::queryFirstRow(
                 'SELECT object_id, share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON  (i.id = si.object_id)
-                INNER JOIN ' . prefixTable('nested_tree') . ' AS nt ON  (i.id_tree = nt.id)
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON  (i.id = si.object_id)
+                INNER JOIN ' . prefixTable('nested_tree').' AS nt ON  (i.id_tree = nt.id)
                 WHERE user_id = %i AND nt.personal_folder = %i',
                 $post_user_id,
                 0
@@ -1616,7 +1616,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1680,7 +1680,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1813,7 +1813,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1875,7 +1875,7 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1941,7 +1941,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2088,15 +2088,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2128,7 +2128,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2161,7 +2161,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2185,15 +2185,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $_SESSION['user_id']
@@ -2225,7 +2225,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2247,7 +2247,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -2271,15 +2271,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2311,7 +2311,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2333,7 +2333,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2357,14 +2357,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2396,7 +2396,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2441,15 +2441,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2481,7 +2481,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2503,8 +2503,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2536,16 +2536,16 @@ 
     if (count($_SESSION['personal_folders']) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $_SESSION['personal_folders']
         );
         foreach ($rows as $record) {
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $_SESSION['user_id']
@@ -2572,7 +2572,7 @@ 
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -2595,7 +2595,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2619,7 +2619,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2644,9 +2644,9 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     $_SESSION['personal_folders']
                 );
                 $countUserPersonalItems = DB::count();
@@ -2689,7 +2689,7 @@ 
                         // Loop on files
                         $rows = DB::query(
                             'SELECT id, file
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE status != %s
                             AND id_item = %i',
                             TP_ENCRYPTION_NAME,
@@ -2700,14 +2700,14 @@ 
                             // Now decrypt the file
                             prepareFileWithDefuse(
                                 'decrypt',
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                                 $SETTINGS,
                                 $post_user_psk
                             );
 
                             // Encrypt the file
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                             DB::update(
                                 prefixTable('files'),
@@ -2730,7 +2730,7 @@ 
                             );
 
                             // Unlink original file
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                         }
                     }
                 }
@@ -2799,7 +2799,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT '.$post_fields.'
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2843,7 +2843,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2894,7 +2894,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2932,7 +2932,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key, special
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2968,7 +2968,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2992,14 +2992,14 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT id, pw
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $post_user_id
@@ -3080,7 +3080,7 @@ 
             $_SESSION['user_id']
         );
         // Return data
-        return '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
+        return '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
     }
     
     return '[{"new_value":"expired"}]';

sources/identify.php

Spacing +50 added lines, -51 removed lines

@@ -81,7 +81,7 @@ 
 if ($checkUserAccess->checkSession() === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -215,18 +215,18 @@ 
     }
 
     // Check if Duo auth is in progress and pass the pw and login back to the standard login process
-    if(
+    if (
         isKeyExistingAndEqual('duo', 1, $SETTINGS) === true
         && $dataReceived['user_2fa_selection'] === 'duo'
-        && $superGlobal->get('duo_status','SESSION') === 'IN_PROGRESS'
+        && $superGlobal->get('duo_status', 'SESSION') === 'IN_PROGRESS'
         && !empty($dataReceived['duo_state'])
-    ){
+    ) {
         $key = hash('sha256', $dataReceived['duo_state']);
         $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16);
-        $duo_data_dec = openssl_decrypt(base64_decode($superGlobal->get('duo_data','SESSION')), 'AES-256-CBC', $key, 0, $iv);
+        $duo_data_dec = openssl_decrypt(base64_decode($superGlobal->get('duo_data', 'SESSION')), 'AES-256-CBC', $key, 0, $iv);
         // Clear the data from the Duo process to continue clean with the standard login process
-        $superGlobal->forget('duo_data','SESSION');
-        if($duo_data_dec === false){
+        $superGlobal->forget('duo_data', 'SESSION');
+        if ($duo_data_dec === false) {
             echo prepareExchangedData(
                 [
                     'error' => true,
@@ -241,7 +241,7 @@ 
         $dataReceived['login'] = $duo_data['duo_login'];
     }
 
-    if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
+    if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
         echo json_encode([
             'data' => prepareExchangedData(
                 [
@@ -546,7 +546,7 @@ 
         }
         // Append with roles from AD groups
         if (is_null($userInfo['roles_from_ad_groups']) === false) {
-            $userInfo['fonction_id'] = empty($userInfo['fonction_id'])  === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id']. ';' . $userInfo['roles_from_ad_groups'];
+            $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
         }
         // store
         $superGlobal->put('fonction_id', $userInfo['fonction_id'], 'SESSION');
@@ -557,7 +557,7 @@ 
         if (count($superGlobal->get('user_roles', 'SESSION')) > 0) {
             $rolesList = DB::query(
                 'SELECT id, title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id IN %li',
                 $superGlobal->get('user_roles', 'SESSION')
             );
@@ -622,7 +622,7 @@ 
 
         // build complete array of roles
         $superGlobal->put('arr_roles_full', [], 'SESSION');
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
         foreach ($rows as $record) {
             $superGlobal->put(
                 $record['id'],
@@ -690,10 +690,10 @@ 
         $superGlobal->put('latest_items_tab', [], 'SESSION');
         $superGlobal->put('nb_roles', 0, 'SESSION');
         foreach ($superGlobal->get('latest_items', 'SESSION') as $item) {
-            if (! empty($item)) {
+            if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -702,7 +702,7 @@ 
                     [
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
                     ],
                     'SESSION',
                     'latest_items_tab'
@@ -713,7 +713,7 @@ 
         // Get cahce tree info
         $cacheTreeData = DB::queryFirstRow(
             'SELECT visible_folders
-            FROM ' . prefixTable('cache_tree') . '
+            FROM ' . prefixTable('cache_tree').'
             WHERE user_id=%i',
             (int) $superGlobal->get('user_id', 'SESSION')
         );
@@ -745,7 +745,7 @@ 
             && (int) $sessionAdmin !== 1
         ) {
             // get all Admin users
-            $val = DB::queryfirstrow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $val = DB::queryfirstrow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             if (DB::count() > 0) {
                 // Add email to table
                 prepareSendingEmail(
@@ -757,7 +757,7 @@ 
                             '#tp_time#',
                         ],
                         [
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                             date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                         ],
@@ -907,7 +907,7 @@ 
 {
     $rows = DB::query(
         'SELECT date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE field_1 = %s
         AND type = 'failed_auth'
         AND label = 'password_is_not_correct'
@@ -921,7 +921,7 @@ 
         foreach ($rows as $record) {
             array_push(
                 $arrAttempts,
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
             );
         }
     }
@@ -975,7 +975,7 @@ 
     $ldapConnection
 ) : bool
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
     if ((int) $userInfoDisabled === 1) {
         return false;
@@ -1196,7 +1196,7 @@ 
         // 2- Get user info from AD
         // We want to isolate attribute ldap_user_attribute or mostly samAccountName
         $userADInfos = $connection->query()
-            ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $username)
+            ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $username)
             ->firstOrFail();
 
         // Is user enabled? Only ActiveDirectory
@@ -1214,7 +1214,7 @@ 
         // Determining Auth Failure Cause
         $dispatcher = Container::getDispatcher();
         $message = '';
-        $dispatcher->listen(Failed::class, function (Failed $event) use (&$message) {
+        $dispatcher->listen(Failed::class, function(Failed $event) use (&$message) {
             $ldap = $event->getConnection();
         
             // The diagnostic message will be available here.
@@ -1238,7 +1238,7 @@ 
         // For OpenLDAP and others, we use attribute dn
         $userAuthAttempt = $connection->auth()->attempt(
             $SETTINGS['ldap_type'] === 'ActiveDirectory' ?
-                $userADInfos['userprincipalname'][0] :  // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
+                $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
                 $userADInfos['dn'],
             $passwordClear
         );        
@@ -1254,7 +1254,7 @@ 
         $error = $e->getDetailedError();
         return [
             'error' => true,
-            'message' => langHdl('error')." - ".(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage() : $e),
+            'message' => langHdl('error')." - ".(isset($error) === true ? $error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage() : $e),
 
         ];
     }
@@ -1310,8 +1310,7 @@ 
     }
     $ret = getUserADGroups(
         $SETTINGS['ldap_type'] === 'ActiveDirectory' ?
-            $userADInfos[(isset($SETTINGS['ldap_user_dn_attribute']) === true && empty($SETTINGS['ldap_user_dn_attribute']) === false) ? $SETTINGS['ldap_user_dn_attribute'] : 'distinguishedname'][0] :
-            $userADInfos['dn'], 
+            $userADInfos[(isset($SETTINGS['ldap_user_dn_attribute']) === true && empty($SETTINGS['ldap_user_dn_attribute']) === false) ? $SETTINGS['ldap_user_dn_attribute'] : 'distinguishedname'][0] : $userADInfos['dn'], 
         $connection, 
         $SETTINGS
     );
@@ -1347,12 +1346,12 @@ 
     if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
         // Get user groups from AD
         $user_ad_groups = [];
-        foreach($groups as $group) {
+        foreach ($groups as $group) {
             //print_r($group);
             // get relation role id for AD group
             $role = DB::queryFirstRow(
                 'SELECT lgr.role_id
-                FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
+                FROM ' . prefixTable('ldap_groups_roles').' AS lgr
                 WHERE lgr.ldap_group_id = %i',
                 $group
             );
@@ -1502,7 +1501,7 @@ 
     }
 
     // Now check yubico validity
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
     $auth = $yubi->verify($yubico_key);
     //, null, null, null, 60
@@ -1656,7 +1655,7 @@ 
             $mfaMessage = langHdl('ga_flash_qr_and_login');
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1669,7 +1668,7 @@ 
                 $userInfo['id']
             );
             $firstTime = [
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1727,8 +1726,8 @@ 
     $superGlobal = new SuperGlobal();
 
     $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
-    $saved_state = null !== $superGlobal->get('duo_state','SESSION') ? $superGlobal->get('duo_state','SESSION') : '';
-    $duo_status = null !== $superGlobal->get('duo_status','SESSION') ? $superGlobal->get('duo_status','SESSION') : '';
+    $saved_state = null !== $superGlobal->get('duo_state', 'SESSION') ? $superGlobal->get('duo_state', 'SESSION') : '';
+    $duo_status = null !== $superGlobal->get('duo_status', 'SESSION') ? $superGlobal->get('duo_status', 'SESSION') : '';
 
     // Ensure state and login are set
     if (
@@ -1825,7 +1824,7 @@ 
         }*/
         return [
             'error' => true,
-            'message' => $duo_error . langHdl('duo_error_check_config'),
+            'message' => $duo_error.langHdl('duo_error_check_config'),
             'pwd_attempts' => (int) $sessionPwdAttempts,
             'debug_message' => $e->getMessage(),
             'proceedIdentification' => false,
@@ -1841,7 +1840,7 @@ 
         } catch (NestedTreeDuoException $e) {
             return [
                 'error' => true,
-                'message' => $duo_error . langHdl('duo_error_url'),
+                'message' => $duo_error.langHdl('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'debug_message' => $e->getMessage(),
                 'proceedIdentification' => false,
@@ -1849,7 +1848,7 @@ 
         }
         
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
-        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
+        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) {
             // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt
             $key = hash('sha256', $duo_state);
             $iv = substr(hash('sha256', $duo_state), 0, 16);
@@ -1877,7 +1876,7 @@ 
         } else {
             return [
                 'error' => true,
-                'message' => $duo_error . langHdl('duo_error_url'),
+                'message' => $duo_error.langHdl('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'proceedIdentification' => false,
             ];
@@ -1898,8 +1897,8 @@ 
         // return the response (which should be the user name)
         if ($decoded_token['preferred_username'] === $username) {
             $superGlobal->put('duo_status', 'COMPLET', 'SESSION');
-            $superGlobal->forget('duo_state','SESSION');
-            $superGlobal->forget('duo_data','SESSION');
+            $superGlobal->forget('duo_state', 'SESSION');
+            $superGlobal->forget('duo_data', 'SESSION');
             $superGlobal->put('login', $username, 'SESSION');
             //unset($superGlobal);
 
@@ -1911,9 +1910,9 @@ 
             ];
         } else {
             // Something wrong, username from the original Duo request is different than the one received now
-            $superGlobal->forget('duo_status','SESSION');
-            $superGlobal->forget('duo_state','SESSION');
-            $superGlobal->forget('duo_data','SESSION');
+            $superGlobal->forget('duo_status', 'SESSION');
+            $superGlobal->forget('duo_state', 'SESSION');
+            $superGlobal->forget('duo_data', 'SESSION');
             unset($superGlobal);
 
             return [
@@ -1925,9 +1924,9 @@ 
         }
     }
     // If we are here something wrong
-    $superGlobal->forget('duo_status','SESSION');
-    $superGlobal->forget('duo_state','SESSION');
-    $superGlobal->forget('duo_data','SESSION');
+    $superGlobal->forget('duo_status', 'SESSION');
+    $superGlobal->forget('duo_state', 'SESSION');
+    $superGlobal->forget('duo_data', 'SESSION');
     unset($superGlobal);
     return [
         'error' => true,
@@ -2084,8 +2083,8 @@ 
     public function get_user_info($login, $enable_ad_user_auto_creation) {
         $data = DB::queryFirstRow(
             'SELECT u.*, a.value AS api_key
-            FROM ' . prefixTable('users') . ' AS u
-            LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id)
+            FROM ' . prefixTable('users').' AS u
+            LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id)
             WHERE login = %s AND deleted_at IS NULL',
             $login
         );
@@ -2434,16 +2433,16 @@ 
 
             if ($ret['error'] !== false) {
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
-                $superGlobal->forget('duo_state','SESSION');
-                $superGlobal->forget('duo_data','SESSION');
-                $superGlobal->forget('duo_status','SESSION');
+                $superGlobal->forget('duo_state', 'SESSION');
+                $superGlobal->forget('duo_data', 'SESSION');
+                $superGlobal->forget('duo_status', 'SESSION');
                 unset($superGlobal);
                 return [
                     'error' => true,
                     'mfaData' => $ret,
                     'mfaQRCodeInfos' => false,
                 ];
-            } else if ($ret['duo_url_ready'] === true){
+            } else if ($ret['duo_url_ready'] === true) {
                 return [
                     'error' => false,
                     'mfaData' => $ret,

sources/fields.queries.php

Spacing +3 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
 ) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -541,8 +541,7 @@ 
             $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' :
-                filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
+            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
 
             if (empty($post_fieldId) === false) {
                 // UPDATE FIELD
@@ -558,7 +557,7 @@ 
                         'encrypted_data' => $post_encrypted,
                         'is_mandatory' => $post_mandatory,
                         'masked' => $post_masked,
-                        'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles),
+                        'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles),
                         'order' => calculateOrder($post_fieldId, $post_order),
                     ),
                     'id = %i',

api/Controller/Api/BaseController.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
     {
         $superGlobal = new SuperGlobal();
         $uri = parse_url($superGlobal->get('REQUEST_URI', 'SERVER'), PHP_URL_PATH);
-        $uri = explode( '/', $uri );
+        $uri = explode('/', $uri);
         return $this->sanitizeUrl(array_slice($uri, ((int) array_search('index.php', $uri) + 1)));
     }
 
@@ -71,7 +71,7 @@ 
     {
         $filters = [];
         $array_size = count($array);
-        for ($i=0; $i < $array_size; $i++) {
+        for ($i = 0; $i < $array_size; $i++) {
             array_push($filters, 'trim|escape');
         }
         
@@ -89,7 +89,7 @@ 
      * @param mixed  $data
      * @param string $httpHeader
      */
-    protected function sendOutput($data, $httpHeaders=array()): void
+    protected function sendOutput($data, $httpHeaders = array()): void
     {
         header_remove('Set-Cookie');
 

api/inc/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -26,10 +26,10 @@ 
 
 Use TeampassClasses\SuperGlobal\SuperGlobal;
 
-define("API_ROOT_PATH", __DIR__ . "/..");
+define("API_ROOT_PATH", __DIR__."/..");
 
 // include main configuration file
-require API_ROOT_PATH . '/../sources/main.functions.php';
+require API_ROOT_PATH.'/../sources/main.functions.php';
 
 // init
 loadClasses('DB');
@@ -38,12 +38,12 @@ 
 $superGlobal = new SuperGlobal();
 
 // include the base controller file
-require API_ROOT_PATH . "/Controller/Api/BaseController.php";
+require API_ROOT_PATH."/Controller/Api/BaseController.php";
 
 // include the use model file
-require API_ROOT_PATH . "/Model/UserModel.php";
-require API_ROOT_PATH . "/Model/ItemModel.php";
-require API_ROOT_PATH . "/Model/FolderModel.php";
+require API_ROOT_PATH."/Model/UserModel.php";
+require API_ROOT_PATH."/Model/ItemModel.php";
+require API_ROOT_PATH."/Model/FolderModel.php";
 
 /**
  * Launch expected action for ITEM
@@ -54,10 +54,10 @@ 
  */
 function itemAction(array $actions, array $userData)
 {
-    require API_ROOT_PATH . "/Controller/Api/ItemController.php";
+    require API_ROOT_PATH."/Controller/Api/ItemController.php";
     
     $objFeedController = new ItemController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -70,10 +70,10 @@ 
  */
 function folderAction(array $actions, array $userData)
 {
-    require API_ROOT_PATH . "/Controller/Api/FolderController.php";
+    require API_ROOT_PATH."/Controller/Api/FolderController.php";
 
     $objFeedController = new FolderController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -84,7 +84,7 @@ 
  */
 function apiIsEnabled(): string
 {
-    require API_ROOT_PATH . '/../includes/config/tp.config.php';
+    require API_ROOT_PATH.'/../includes/config/tp.config.php';
 
     if ((int) $SETTINGS['api'] === 1) {
         return json_encode(
@@ -113,7 +113,7 @@ 
  */
 function verifyAuth(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false && is_jwt_valid($bearer_token) === true) {
@@ -143,7 +143,7 @@ 
  */
 function getDataFromToken(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false) {

api/inc/jwt_utils.php

Indentation +44 added lines, -44 removed lines

@@ -26,43 +26,43 @@ 
 Use TeampassClasses\SuperGlobal\SuperGlobal;
 
 function generate_jwt($headers, $payload) {
-	$headers_encoded = base64url_encode(json_encode($headers));
+    $headers_encoded = base64url_encode(json_encode($headers));
 	
-	$payload_encoded = base64url_encode(json_encode($payload));
+    $payload_encoded = base64url_encode(json_encode($payload));
 	
-	$signature = hash_hmac('SHA256', "$headers_encoded.$payload_encoded", DB_PASSWD, true);
-	$signature_encoded = base64url_encode($signature);
+    $signature = hash_hmac('SHA256', "$headers_encoded.$payload_encoded", DB_PASSWD, true);
+    $signature_encoded = base64url_encode($signature);
 	
-	$jwt = "$headers_encoded.$payload_encoded.$signature_encoded";
+    $jwt = "$headers_encoded.$payload_encoded.$signature_encoded";
 	
-	return $jwt;
+    return $jwt;
 }
 
 function is_jwt_valid($jwt) {
-	// split the jwt
-	$tokenParts = explode('.', $jwt);
-	$header = base64_decode($tokenParts[0]);
-	$payload = base64_decode($tokenParts[1]);
-	$signature_provided = $tokenParts[2];
+    // split the jwt
+    $tokenParts = explode('.', $jwt);
+    $header = base64_decode($tokenParts[0]);
+    $payload = base64_decode($tokenParts[1]);
+    $signature_provided = $tokenParts[2];
 
-	// check the expiration time - note this will cause an error if there is no 'exp' claim in the jwt
-	$expiration = json_decode($payload)->exp;
-	$is_token_expired = ($expiration - time()) < 0;
+    // check the expiration time - note this will cause an error if there is no 'exp' claim in the jwt
+    $expiration = json_decode($payload)->exp;
+    $is_token_expired = ($expiration - time()) < 0;
 
-	// build a signature based on the header and payload using the secret
-	$base64_url_header = base64url_encode($header);
-	$base64_url_payload = base64url_encode($payload);
-	$signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
-	$base64_url_signature = base64url_encode($signature);
+    // build a signature based on the header and payload using the secret
+    $base64_url_header = base64url_encode($header);
+    $base64_url_payload = base64url_encode($payload);
+    $signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
+    $base64_url_signature = base64url_encode($signature);
 
-	// verify it matches the signature provided in the jwt
-	$is_signature_valid = ($base64_url_signature === $signature_provided);
+    // verify it matches the signature provided in the jwt
+    $is_signature_valid = ($base64_url_signature === $signature_provided);
 	
-	if ($is_token_expired || !$is_signature_valid) {
-		return FALSE;
-	} else {
-		return TRUE;
-	}
+    if ($is_token_expired || !$is_signature_valid) {
+        return FALSE;
+    } else {
+        return TRUE;
+    }
 }
 
 function base64url_encode($data) {
@@ -70,24 +70,24 @@ 
 }
 
 function get_authorization_header(){
-	$superGlobal = new SuperGlobal();
-	$headers = null;
+    $superGlobal = new SuperGlobal();
+    $headers = null;
 	
-	if (null !== $superGlobal->get('Authorization', 'SERVER')) {
-		$headers = trim($superGlobal->get('Authorization', 'SERVER'));
-	} else if (null !== $superGlobal->get('HTTP_AUTHORIZATION', 'SERVER')) { //Nginx or fast CGI
-		$headers = trim($superGlobal->get('HTTP_AUTHORIZATION', 'SERVER'));
-	} else if (function_exists('apache_request_headers') === true) {
-		$requestHeaders = (array) apache_request_headers();
-		// Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
-		$requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
-		//print_r($requestHeaders);
-		if (isset($requestHeaders['Authorization']) === true) {
-			$headers = trim($requestHeaders['Authorization']);
-		}
-	}
+    if (null !== $superGlobal->get('Authorization', 'SERVER')) {
+        $headers = trim($superGlobal->get('Authorization', 'SERVER'));
+    } else if (null !== $superGlobal->get('HTTP_AUTHORIZATION', 'SERVER')) { //Nginx or fast CGI
+        $headers = trim($superGlobal->get('HTTP_AUTHORIZATION', 'SERVER'));
+    } else if (function_exists('apache_request_headers') === true) {
+        $requestHeaders = (array) apache_request_headers();
+        // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
+        $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+        //print_r($requestHeaders);
+        if (isset($requestHeaders['Authorization']) === true) {
+            $headers = trim($requestHeaders['Authorization']);
+        }
+    }
 	
-	return $headers;
+    return $headers;
 }
 
 function get_bearer_token() {
@@ -104,8 +104,8 @@ 
 
 function get_bearer_data($jwt) {
     // split the jwt
-	$tokenParts = explode('.', $jwt);
-	$payload = base64_decode($tokenParts[1]);
+    $tokenParts = explode('.', $jwt);
+    $payload = base64_decode($tokenParts[1]);
 	
     // HEADER: Get the access token from the header
     if (empty($payload) === false) {

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	// build a signature based on the header and payload using the secret
 	$base64_url_header = base64url_encode($header);
 	$base64_url_payload = base64url_encode($payload);
-	$signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
+	$signature = hash_hmac('SHA256', $base64_url_header.".".$base64_url_payload, DB_PASSWD, true);
 	$base64_url_signature = base64url_encode($signature);
 
 	// verify it matches the signature provided in the jwt
@@ -69,7 +69,7 @@ 
     return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
 }
 
-function get_authorization_header(){
+function get_authorization_header() {
 	$superGlobal = new SuperGlobal();
 	$headers = null;
 	

api/Model/ItemModel.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
  */
 Use TeampassClasses\NestedTree\NestedTree;
 
-require_once API_ROOT_PATH . "/Model/Database.php";
+require_once API_ROOT_PATH."/Model/Database.php";
 
 class ItemModel extends Database
 {
@@ -46,15 +46,15 @@ 
             "SELECT i.id, label, description, i.pw, i.url, i.id_tree, i.login, i.email, i.viewed_no, i.fa_icon, i.inactif, i.perso, t.title as folder_label
             FROM ".prefixTable('items')." as i
             LEFT JOIN ".prefixTable('nested_tree')." as t ON (t.id = i.id_tree) ".
-            $sqlExtra . 
-            " ORDER BY i.id ASC" .
-            ($limit > 0 ? " LIMIT ?". ["i", $limit] : '')
+            $sqlExtra. 
+            " ORDER BY i.id ASC".
+            ($limit > 0 ? " LIMIT ?".["i", $limit] : '')
         );
         $ret = [];
         foreach ($rows as $row) {
             $userKey = $this->select(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = '.$userId.' AND object_id = '.$row['id']                
             );
             if (count($userKey) === 0 || empty($row['pw']) === true) {
@@ -88,7 +88,7 @@ 
                 if (empty($path) === true) {
                     $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                 } else {
-                    $path .= '/' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                    $path .= '/'.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                 }
             }