Inspection of "Merge branch 'release/3.1.5.19'" - nilsteampassnet/TeamPass - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 5cf388...378303 )

by Nils

created 2025-12-31 15:31 UTC

Status

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -79,7 +79,7 @@  discard block
 block discarded – undo
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
         );
 
         // Initialisation
-        $file = $SETTINGS['path_to_files_folder'] . '/' . $data['valeur'];
+        $file = $SETTINGS['path_to_files_folder'].'/'.$data['valeur'];
         $importation_possible = true;
         $valuesToImport = [];
         $items_number = 0;
@@ -223,26 +223,26 @@  discard block
 block discarded – undo
                 'ISO-8859-1',
                 'ISO-8859-15',
                 'Windows-1252',
-                'Windows-1251',  // Cyrillique
-                'CP1251',        // Cyrillique alternatif
-                'KOI8-R',        // Cyrillique russe
-                'Shift_JIS',     // Japonais
-                'EUC-JP',        // Japonais
-                'ISO-2022-JP',   // Japonais
-                'TIS-620',       // Thaï
-                'Windows-874',   // Thaï Windows
-                'Big5',          // Chinois traditionnel
-                'GB2312',        // Chinois simplifié
-                'GBK',           // Chinois simplifié étendu
-                'EUC-KR',        // Coréen
-                'ISO-8859-2',    // Europe centrale
-                'ISO-8859-5',    // Cyrillique ISO
-                'ISO-8859-7',    // Grec
-                'Windows-1250',  // Europe centrale
-                'Windows-1253',  // Grec
-                'Windows-1254',  // Turc
-                'Windows-1255',  // Hébreu
-                'Windows-1256',  // Arabe
+                'Windows-1251', // Cyrillique
+                'CP1251', // Cyrillique alternatif
+                'KOI8-R', // Cyrillique russe
+                'Shift_JIS', // Japonais
+                'EUC-JP', // Japonais
+                'ISO-2022-JP', // Japonais
+                'TIS-620', // Thaï
+                'Windows-874', // Thaï Windows
+                'Big5', // Chinois traditionnel
+                'GB2312', // Chinois simplifié
+                'GBK', // Chinois simplifié étendu
+                'EUC-KR', // Coréen
+                'ISO-8859-2', // Europe centrale
+                'ISO-8859-5', // Cyrillique ISO
+                'ISO-8859-7', // Grec
+                'Windows-1250', // Europe centrale
+                'Windows-1253', // Grec
+                'Windows-1254', // Turc
+                'Windows-1255', // Hébreu
+                'Windows-1256', // Arabe
             ];
 
             // Get the list of encodings supported by the system
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
 
         // Get the data and ensure columns are correctly mapped
         $interpreter = new Interpreter();
-        $interpreter->addObserver(function (array $row) use (&$valuesToImport, $header) {
+        $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) {
             $rowData = array_combine($header, $row);
 
             if ($rowData !== false) {
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
             // Handle multiple lignes description
             if (strpos($comments, '<br>') !== false || strpos($label, '<br>') !== false) {
                 $continue_on_next_line = true;
-                $comment .= " " . $label . " " . $comments;
+                $comment .= " ".$label." ".$comments;
             } else {
                 // Insert previous line if changing line
                 if (!empty($label)) {
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
                     // Insert in batch
                     $batchInsert[] = array(
                         'label'        => $label,
-                        'description'  => $comment . $comments,
+                        'description'  => $comment.$comments,
                         'pwd'          => $pwd,
                         'url'          => $url,
                         'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
             // Insert in batch
             $batchInsert[] = array(
                 'label'        => $label,
-                'description'  => $comment . $comments,
+                'description'  => $comment.$comments,
                 'pwd'          => $pwd,
                 'url'          => $url,
                 'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -402,10 +402,10 @@  discard block
 block discarded – undo
             $values = [];
 
             foreach ($batchInsert as $data) {
-                $values[] = "('" . implode("','", array_map('addslashes', $data)) . "')";
+                $values[] = "('".implode("','", array_map('addslashes', $data))."')";
             }
 
-            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES " . implode(',', $values);
+            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES ".implode(',', $values);
 
             DB::query($sql);
         }
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
             $parentId = $dataReceived['folderId']; // Strating with provided folder
 
             foreach ($parts as $part) {
-                $currentPath = trim($currentPath . "/" . $part, "/");
+                $currentPath = trim($currentPath."/".$part, "/");
                 $currentFolder = $part;
 
                 // Check if this folder has already been created
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
                         // Get ID of existing folder
                         $ret = DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('nested_tree') . '
+                            FROM ' . prefixTable('nested_tree').'
                             WHERE title = %s',
                             $currentFolder
                         );
@@ -805,9 +805,9 @@  discard block
 block discarded – undo
                 ];
 
                 error_log(
-                    'TEAMPASS Error - SQL Error during import | increment_id: ' . $item['increment_id'] .
-                    ' | Message: ' . $e->getMessage() .
-                    ' | StackTrace: ' . $e->getTraceAsString()
+                    'TEAMPASS Error - SQL Error during import | increment_id: '.$item['increment_id'].
+                    ' | Message: '.$e->getMessage().
+                    ' | StackTrace: '.$e->getTraceAsString()
                 );
             }
         }
@@ -1122,7 +1122,7 @@  discard block
 block discarded – undo
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             if (!isset($arrFolders[$folder['parentFolderId']])) {
                 // If parent folder is not in the array, it means it is the destination folder
@@ -1197,7 +1197,7 @@  discard block
 block discarded – undo
         DB::startTransaction();
 
         // Import all items
-        foreach($post_items as $item) {
+        foreach ($post_items as $item) {
             // get info about this folder
             $destinationFolderMore = DB::queryFirstRow(
                 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
@@ -1219,7 +1219,7 @@  discard block
 block discarded – undo
                 $cryptedStuff['objectKey'] = '';
             }
             $post_password = $cryptedStuff['encrypted'];
-            $folderId = isset($post_folders[$item['parentFolderId']]['id']) ? (int)$post_folders[$item['parentFolderId']]['id'] : 0;
+            $folderId = isset($post_folders[$item['parentFolderId']]['id']) ? (int) $post_folders[$item['parentFolderId']]['id'] : 0;
 
             //ADD item
             DB::insert(
@@ -1406,7 +1406,7 @@  discard block
 block discarded – undo
 
         //For each role to which the user depends on, add the folder just created.
         // (if not personal, otherwise, add to user-personal_folders)
-        if ( $isPersonalFolder ) {
+        if ($isPersonalFolder) {
             SessionManager::addRemoveFromSessionArray('user-personal_folders', [$id], 'add');
         } else {
             foreach ($session->get('system-array_roles') as $role) {
@@ -1470,7 +1470,7 @@  discard block
 block discarded – undo
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

Please login to merge, or discard this patch.

pages/profile.php 1 patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -101,49 +101,49 @@  discard block
 block discarded – undo
 $zones = timezone_list();
 // prepare list of languages
 $languages = DB::query(
-    'SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC'
+    'SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC'
 );
 
 // Do some stats
 $userItemsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_creation" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userModificationNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_modification" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userSeenItemsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item) as count
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_shown" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userSeenPasswordsNumber = DB::queryFirstField(
     'SELECT COUNT(id_item)
-    FROM ' . prefixTable('log_items') . '
+    FROM ' . prefixTable('log_items').'
     WHERE action = "at_password_shown" AND  id_user = %i',
     $session->get('user-id')
 );
 
 $userInfo = DB::queryFirstRow(
     'SELECT avatar, last_pw_change
-    FROM ' . prefixTable('users') . ' 
+    FROM ' . prefixTable('users').' 
     WHERE id = %i',
     $session->get('user-id')
 );
 
 if (empty($userInfo['avatar']) === true) {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
 } else {
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
+    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
 }
 
 // Get Groups name
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
 foreach ($session->get('user-roles_array') as $role) {
     $tmp = DB::queryFirstRow(
         'SELECT title 
-        FROM ' . prefixTable('roles_title') . ' 
+        FROM ' . prefixTable('roles_title').' 
         WHERE id = %i',
         $role
     );
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
                         <h3 id="profile-username" class="text-center">
                             <?php
                             if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) {
-                                echo $session->get('user-name') . ' ' . $session->get('user-lastname');
+                                echo $session->get('user-name').' '.$session->get('user-lastname');
                             } else {
                                 echo $session->get('user-login');
                             }
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
                                             } else {
                                                 echo date('d/m/Y', (int) $session->get('user-last_connection'));
                                             }
-                                            echo ' ' . $lang->get('at') . ' ';
+                                            echo ' '.$lang->get('at').' ';
                                             if (isset($SETTINGS['time_format']) === true) {
                                                 echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection'));
                                             } else {
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
                                         </a>
                                     </li>
                                     <?php
-                                    if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) {
+                                    if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) {
                                         // Handle last password change string
                                         if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) {
                                             if (isset($SETTINGS['date_format']) === true) {
@@ -295,12 +295,12 @@  discard block
 block discarded – undo
                                         ) {
                                             $numDaysBeforePwExpiration = '';
                                         } else {
-                                            $numDaysBeforePwExpiration = $lang['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $lang['days'] . '.';
+                                            $numDaysBeforePwExpiration = $lang['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$lang['days'].'.';
                                         }
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b>
-                                        <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
+                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b>
+                                        <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
                                     </li>';
                                     }
                                     ?>
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
                                     if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b>
+                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b>
                                         <button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy  pointer"></i></button>
                                         <a class="float-right mr-2" id="profile-user-api-token">',
                                             null !== $session->get('user-api_key') ? $session->get('user-api_key') : '',
@@ -338,12 +338,12 @@  discard block
 block discarded – undo
                                         <?php
                                         $rows = DB::query(
                                             'SELECT label AS labelAction, date, null
-                                                    FROM ' . prefixTable('log_system') . '
+                                                    FROM ' . prefixTable('log_system').'
                                                     WHERE qui = %i
                                                     UNION
                                                     SELECT l.action, l.date, i.label AS itemLabel
-                                                    FROM ' . prefixTable('log_items') . ' AS l
-                                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+                                                    FROM ' . prefixTable('log_items').' AS l
+                                                    INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
                                                     WHERE l.id_user = %i AND l.action IN ("at_access")
                                                     ORDER BY date DESC
                                                     LIMIT 0, 40',
@@ -357,9 +357,9 @@  discard block
 block discarded – undo
                                                 $text = $lang->get($record['labelAction']);
                                             }
                                             if (empty($record['NULL']) === false) {
-                                                $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
+                                                $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
                                             }
-                                            echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>';
+                                            echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>';
                                         }
                                         ?>
                                     </ul>
@@ -393,13 +393,13 @@  discard block
 block discarded – undo
                                 <?php endif; /* disable_user_edit_profile */
                                 if (($SETTINGS['disable_user_edit_timezone'] ?? '0') === '0') : ?>
                                     <div class="form-group">
-                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label>
+                                        <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label>
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-timezone">
                                                 <?php foreach ($zones as $key => $zone): ?>
                                                     <option value="<?php echo $key; ?>"<?php 
                                                         if ($session->has('user-timezone'))
-                                                            if($session->get('user-timezone') === $key)
+                                                            if ($session->get('user-timezone') === $key)
                                                                 echo ' selected';
                                                             elseif ($session->get('user-timezone') === 'not_defined')
                                                                 if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
@@ -417,10 +417,10 @@  discard block
 block discarded – undo
                                             <select class="form-control" id="profile-user-language">
                                                 <?php
                                                     foreach ($languages as $language) {
-                                                        echo '<option value="' . $language['name'] . '"',
+                                                        echo '<option value="'.$language['name'].'"',
                                                         strtolower($session->get('user-language')) === strtolower($language['name']) ?
                                                         ' selected="selected"' : '',
-                                                    '>' . $language['label'] . '</option>';
+                                                    '>'.$language['label'].'</option>';
                                                     }
                                                 ?>
                                             </select>
@@ -433,11 +433,11 @@  discard block
 block discarded – undo
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-split_view_mode">
                                                 
-                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : '';?>>
+                                                <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('no'); ?>
                                                 </option>
                                                 
-                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : '';?>>
+                                                <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('yes'); ?>
                                                 </option>
                                             </select>
@@ -449,11 +449,11 @@  discard block
 block discarded – undo
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-show_subfolders">
                                                 
-                                                <option value="0" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && $session->get('user-show_subfolders') === 0 ? 'selected' : '';?>>
+                                                <option value="0" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && $session->get('user-show_subfolders') === 0 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('no'); ?>
                                                 </option>
 
-                                                <option value="1" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && (int) $session->get('user-show_subfolders') === 1 ? 'selected' : '';?>>
+                                                <option value="1" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && (int) $session->get('user-show_subfolders') === 1 ? 'selected' : ''; ?>>
                                                     <?php echo $lang->get('yes'); ?>
                                                 </option>
                                             </select>
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
                                                 <?php 
                                                 }
                                                 if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
-                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>';
+                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>';
                                                 }
                                                 ?>
                                                 <div id="profile-avatar-file-container" class="hidden"></div>

Please login to merge, or discard this patch.

		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	) {
80	80	// Not allowed page
81	81	$session->set('system-error_code', ERR_NOT_ALLOWED);
82		- include $SETTINGS['cpassman_dir'] . '/error.php';
	82	+ include $SETTINGS['cpassman_dir'].'/error.php';
83	83	exit;
84	84	}
85	85
		@@ -166,7 +166,7 @@ discard block
		block discarded – undo
166	166	);
167	167
168	168	// Initialisation
169		- $file = $SETTINGS['path_to_files_folder'] . '/' . $data['valeur'];
	169	+ $file = $SETTINGS['path_to_files_folder'].'/'.$data['valeur'];
170	170	$importation_possible = true;
171	171	$valuesToImport = [];
172	172	$items_number = 0;
		@@ -223,26 +223,26 @@ discard block
		block discarded – undo
223	223	'ISO-8859-1',
224	224	'ISO-8859-15',
225	225	'Windows-1252',
226		- 'Windows-1251', // Cyrillique
227		- 'CP1251', // Cyrillique alternatif
228		- 'KOI8-R', // Cyrillique russe
229		- 'Shift_JIS', // Japonais
230		- 'EUC-JP', // Japonais
231		- 'ISO-2022-JP', // Japonais
232		- 'TIS-620', // Thaï
233		- 'Windows-874', // Thaï Windows
234		- 'Big5', // Chinois traditionnel
235		- 'GB2312', // Chinois simplifié
236		- 'GBK', // Chinois simplifié étendu
237		- 'EUC-KR', // Coréen
238		- 'ISO-8859-2', // Europe centrale
239		- 'ISO-8859-5', // Cyrillique ISO
240		- 'ISO-8859-7', // Grec
241		- 'Windows-1250', // Europe centrale
242		- 'Windows-1253', // Grec
243		- 'Windows-1254', // Turc
244		- 'Windows-1255', // Hébreu
245		- 'Windows-1256', // Arabe
	226	+ 'Windows-1251', // Cyrillique
	227	+ 'CP1251', // Cyrillique alternatif
	228	+ 'KOI8-R', // Cyrillique russe
	229	+ 'Shift_JIS', // Japonais
	230	+ 'EUC-JP', // Japonais
	231	+ 'ISO-2022-JP', // Japonais
	232	+ 'TIS-620', // Thaï
	233	+ 'Windows-874', // Thaï Windows
	234	+ 'Big5', // Chinois traditionnel
	235	+ 'GB2312', // Chinois simplifié
	236	+ 'GBK', // Chinois simplifié étendu
	237	+ 'EUC-KR', // Coréen
	238	+ 'ISO-8859-2', // Europe centrale
	239	+ 'ISO-8859-5', // Cyrillique ISO
	240	+ 'ISO-8859-7', // Grec
	241	+ 'Windows-1250', // Europe centrale
	242	+ 'Windows-1253', // Grec
	243	+ 'Windows-1254', // Turc
	244	+ 'Windows-1255', // Hébreu
	245	+ 'Windows-1256', // Arabe
246	246	];
247	247
248	248	// Get the list of encodings supported by the system
		@@ -285,7 +285,7 @@ discard block
		block discarded – undo
285	285
286	286	// Get the data and ensure columns are correctly mapped
287	287	$interpreter = new Interpreter();
288		- $interpreter->addObserver(function (array $row) use (&$valuesToImport, $header) {
	288	+ $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) {
289	289	$rowData = array_combine($header, $row);
290	290
291	291	if ($rowData !== false) {
		@@ -338,7 +338,7 @@ discard block
		block discarded – undo
338	338	// Handle multiple lignes description
339	339	if (strpos($comments, '<br>') !== false \|\| strpos($label, '<br>') !== false) {
340	340	$continue_on_next_line = true;
341		- $comment .= " " . $label . " " . $comments;
	341	+ $comment .= " ".$label." ".$comments;
342	342	} else {
343	343	// Insert previous line if changing line
344	344	if (!empty($label)) {
		@@ -347,7 +347,7 @@ discard block
		block discarded – undo
347	347	// Insert in batch
348	348	$batchInsert[] = array(
349	349	'label' => $label,
350		- 'description' => $comment . $comments,
	350	+ 'description' => $comment.$comments,
351	351	'pwd' => $pwd,
352	352	'url' => $url,
353	353	'folder' => ((int) $session->get('user-admin') === 1 \|\| (int) $session->get('user-manager') === 1 \|\| (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
		@@ -378,7 +378,7 @@ discard block
		block discarded – undo
378	378	// Insert in batch
379	379	$batchInsert[] = array(
380	380	'label' => $label,
381		- 'description' => $comment . $comments,
	381	+ 'description' => $comment.$comments,
382	382	'pwd' => $pwd,
383	383	'url' => $url,
384	384	'folder' => ((int) $session->get('user-admin') === 1 \|\| (int) $session->get('user-manager') === 1 \|\| (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
		@@ -402,10 +402,10 @@ discard block
		block discarded – undo
402	402	$values = [];
403	403
404	404	foreach ($batchInsert as $data) {
405		- $values[] = "('" . implode("','", array_map('addslashes', $data)) . "')";
	405	+ $values[] = "('".implode("','", array_map('addslashes', $data))."')";
406	406	}
407	407
408		- $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES " . implode(',', $values);
	408	+ $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES ".implode(',', $values);
409	409
410	410	DB::query($sql);
411	411	}
		@@ -491,7 +491,7 @@ discard block
		block discarded – undo
491	491	$parentId = $dataReceived['folderId']; // Strating with provided folder
492	492
493	493	foreach ($parts as $part) {
494		- $currentPath = trim($currentPath . "/" . $part, "/");
	494	+ $currentPath = trim($currentPath."/".$part, "/");
495	495	$currentFolder = $part;
496	496
497	497	// Check if this folder has already been created
		@@ -559,7 +559,7 @@ discard block
		block discarded – undo
559	559	// Get ID of existing folder
560	560	$ret = DB::queryFirstRow(
561	561	'SELECT *
562		- FROM ' . prefixTable('nested_tree') . '
	562	+ FROM ' . prefixTable('nested_tree').'
563	563	WHERE title = %s',
564	564	$currentFolder
565	565	);
		@@ -805,9 +805,9 @@ discard block
		block discarded – undo
805	805	];
806	806
807	807	error_log(
808		- 'TEAMPASS Error - SQL Error during import \| increment_id: ' . $item['increment_id'] .
809		- ' \| Message: ' . $e->getMessage() .
810		- ' \| StackTrace: ' . $e->getTraceAsString()
	808	+ 'TEAMPASS Error - SQL Error during import \| increment_id: '.$item['increment_id'].
	809	+ ' \| Message: '.$e->getMessage().
	810	+ ' \| StackTrace: '.$e->getTraceAsString()
811	811	);
812	812	}
813	813	}
		@@ -1122,7 +1122,7 @@ discard block
		block discarded – undo
1122	1122	];
1123	1123	$startPathLevel = 1;
1124	1124
1125		- foreach($post_folders as $folder) {
	1125	+ foreach ($post_folders as $folder) {
1126	1126	// get parent id
1127	1127	if (!isset($arrFolders[$folder['parentFolderId']])) {
1128	1128	// If parent folder is not in the array, it means it is the destination folder
		@@ -1197,7 +1197,7 @@ discard block
		block discarded – undo
1197	1197	DB::startTransaction();
1198	1198
1199	1199	// Import all items
1200		- foreach($post_items as $item) {
	1200	+ foreach ($post_items as $item) {
1201	1201	// get info about this folder
1202	1202	$destinationFolderMore = DB::queryFirstRow(
1203	1203	'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
		@@ -1219,7 +1219,7 @@ discard block
		block discarded – undo
1219	1219	$cryptedStuff['objectKey'] = '';
1220	1220	}
1221	1221	$post_password = $cryptedStuff['encrypted'];
1222		- $folderId = isset($post_folders[$item['parentFolderId']]['id']) ? (int)$post_folders[$item['parentFolderId']]['id'] : 0;
	1222	+ $folderId = isset($post_folders[$item['parentFolderId']]['id']) ? (int) $post_folders[$item['parentFolderId']]['id'] : 0;
1223	1223
1224	1224	//ADD item
1225	1225	DB::insert(
		@@ -1406,7 +1406,7 @@ discard block
		block discarded – undo
1406	1406
1407	1407	//For each role to which the user depends on, add the folder just created.
1408	1408	// (if not personal, otherwise, add to user-personal_folders)
1409		- if ( $isPersonalFolder ) {
	1409	+ if ($isPersonalFolder) {
1410	1410	SessionManager::addRemoveFromSessionArray('user-personal_folders', [$id], 'add');
1411	1411	} else {
1412	1412	foreach ($session->get('system-array_roles') as $role) {
		@@ -1470,7 +1470,7 @@ discard block
		block discarded – undo
1470	1470	];
1471	1471	}
1472	1472
1473		-spl_autoload_register(function ($class) {
	1473	+spl_autoload_register(function($class) {
1474	1474	$prefix = 'League\\Csv\\';
1475	1475	$base_dir = __DIR__.'/src/';
1476	1476	$len = strlen($prefix);

		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('profile') === false) {
69	69	// Not allowed page
70	70	$session->set('system-error_code', ERR_NOT_ALLOWED);
71		- include $SETTINGS['cpassman_dir'] . '/error.php';
	71	+ include $SETTINGS['cpassman_dir'].'/error.php';
72	72	exit;
73	73	}
74	74
		@@ -101,49 +101,49 @@ discard block
		block discarded – undo
101	101	$zones = timezone_list();
102	102	// prepare list of languages
103	103	$languages = DB::query(
104		- 'SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC'
	104	+ 'SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC'
105	105	);
106	106
107	107	// Do some stats
108	108	$userItemsNumber = DB::queryFirstField(
109	109	'SELECT COUNT(id_item) as count
110		- FROM ' . prefixTable('log_items') . '
	110	+ FROM ' . prefixTable('log_items').'
111	111	WHERE action = "at_creation" AND id_user = %i',
112	112	$session->get('user-id')
113	113	);
114	114
115	115	$userModificationNumber = DB::queryFirstField(
116	116	'SELECT COUNT(id_item) as count
117		- FROM ' . prefixTable('log_items') . '
	117	+ FROM ' . prefixTable('log_items').'
118	118	WHERE action = "at_modification" AND id_user = %i',
119	119	$session->get('user-id')
120	120	);
121	121
122	122	$userSeenItemsNumber = DB::queryFirstField(
123	123	'SELECT COUNT(id_item) as count
124		- FROM ' . prefixTable('log_items') . '
	124	+ FROM ' . prefixTable('log_items').'
125	125	WHERE action = "at_shown" AND id_user = %i',
126	126	$session->get('user-id')
127	127	);
128	128
129	129	$userSeenPasswordsNumber = DB::queryFirstField(
130	130	'SELECT COUNT(id_item)
131		- FROM ' . prefixTable('log_items') . '
	131	+ FROM ' . prefixTable('log_items').'
132	132	WHERE action = "at_password_shown" AND id_user = %i',
133	133	$session->get('user-id')
134	134	);
135	135
136	136	$userInfo = DB::queryFirstRow(
137	137	'SELECT avatar, last_pw_change
138		- FROM ' . prefixTable('users') . '
	138	+ FROM ' . prefixTable('users').'
139	139	WHERE id = %i',
140	140	$session->get('user-id')
141	141	);
142	142
143	143	if (empty($userInfo['avatar']) === true) {
144		- $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
	144	+ $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
145	145	} else {
146		- $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
	146	+ $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
147	147	}
148	148
149	149	// Get Groups name
		@@ -151,7 +151,7 @@ discard block
		block discarded – undo
151	151	foreach ($session->get('user-roles_array') as $role) {
152	152	$tmp = DB::queryFirstRow(
153	153	'SELECT title
154		- FROM ' . prefixTable('roles_title') . '
	154	+ FROM ' . prefixTable('roles_title').'
155	155	WHERE id = %i',
156	156	$role
157	157	);
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	<h3 id="profile-username" class="text-center">
198	198	<?php
199	199	if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) {
200		- echo $session->get('user-name') . ' ' . $session->get('user-lastname');
	200	+ echo $session->get('user-name').' '.$session->get('user-lastname');
201	201	} else {
202	202	echo $session->get('user-login');
203	203	}
		@@ -265,7 +265,7 @@ discard block
		block discarded – undo
265	265	} else {
266	266	echo date('d/m/Y', (int) $session->get('user-last_connection'));
267	267	}
268		- echo ' ' . $lang->get('at') . ' ';
	268	+ echo ' '.$lang->get('at').' ';
269	269	if (isset($SETTINGS['time_format']) === true) {
270	270	echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection'));
271	271	} else {
		@@ -275,7 +275,7 @@ discard block
		block discarded – undo
275	275	</a>
276	276	</li>
277	277	<?php
278		- if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) {
	278	+ if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) {
279	279	// Handle last password change string
280	280	if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) {
281	281	if (isset($SETTINGS['date_format']) === true) {
		@@ -295,12 +295,12 @@ discard block
		block discarded – undo
295	295	) {
296	296	$numDaysBeforePwExpiration = '';
297	297	} else {
298		- $numDaysBeforePwExpiration = $lang['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $lang['days'] . '.';
	298	+ $numDaysBeforePwExpiration = $lang['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$lang['days'].'.';
299	299	}
300	300	echo '
301	301	<li class="list-group-item">
302		- <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b>
303		- <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
	302	+ <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b>
	303	+ <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
304	304	</li>';
305	305	}
306	306	?>
		@@ -320,7 +320,7 @@ discard block
		block discarded – undo
320	320	if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
321	321	echo '
322	322	<li class="list-group-item">
323		- <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b>
	323	+ <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b>
324	324	<button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy pointer"></i></button>
325	325	<a class="float-right mr-2" id="profile-user-api-token">',
326	326	null !== $session->get('user-api_key') ? $session->get('user-api_key') : '',
		@@ -338,12 +338,12 @@ discard block
		block discarded – undo
338	338	<?php
339	339	$rows = DB::query(
340	340	'SELECT label AS labelAction, date, null
341		- FROM ' . prefixTable('log_system') . '
	341	+ FROM ' . prefixTable('log_system').'
342	342	WHERE qui = %i
343	343	UNION
344	344	SELECT l.action, l.date, i.label AS itemLabel
345		- FROM ' . prefixTable('log_items') . ' AS l
346		- INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
	345	+ FROM ' . prefixTable('log_items').' AS l
	346	+ INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
347	347	WHERE l.id_user = %i AND l.action IN ("at_access")
348	348	ORDER BY date DESC
349	349	LIMIT 0, 40',
		@@ -357,9 +357,9 @@ discard block
		block discarded – undo
357	357	$text = $lang->get($record['labelAction']);
358	358	}
359	359	if (empty($record['NULL']) === false) {
360		- $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
	360	+ $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
361	361	}
362		- echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>';
	362	+ echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>';
363	363	}
364	364	?>
365	365	</ul>
		@@ -393,13 +393,13 @@ discard block
		block discarded – undo
393	393	<?php endif; /* disable_user_edit_profile */
394	394	if (($SETTINGS['disable_user_edit_timezone'] ?? '0') === '0') : ?>
395	395	<div class="form-group">
396		- <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label>
	396	+ <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label>
397	397	<div class="col-sm-10">
398	398	<select class="form-control" id="profile-user-timezone">
399	399	<?php foreach ($zones as $key => $zone): ?>
400	400	<option value="<?php echo $key; ?>"<?php
401	401	if ($session->has('user-timezone'))
402		- if($session->get('user-timezone') === $key)
	402	+ if ($session->get('user-timezone') === $key)
403	403	echo ' selected';
404	404	elseif ($session->get('user-timezone') === 'not_defined')
405	405	if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
		@@ -417,10 +417,10 @@ discard block
		block discarded – undo
417	417	<select class="form-control" id="profile-user-language">
418	418	<?php
419	419	foreach ($languages as $language) {
420		- echo '<option value="' . $language['name'] . '"',
	420	+ echo '<option value="'.$language['name'].'"',
421	421	strtolower($session->get('user-language')) === strtolower($language['name']) ?
422	422	' selected="selected"' : '',
423		- '>' . $language['label'] . '</option>';
	423	+ '>'.$language['label'].'</option>';
424	424	}
425	425	?>
426	426	</select>
		@@ -433,11 +433,11 @@ discard block
		block discarded – undo
433	433	<div class="col-sm-10">
434	434	<select class="form-control" id="profile-user-split_view_mode">
435	435
436		- <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : '';?>>
	436	+ <option value="0" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && $session->get('user-split_view_mode') === 0 ? 'selected' : ''; ?>>
437	437	<?php echo $lang->get('no'); ?>
438	438	</option>
439	439
440		- <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : '';?>>
	440	+ <option value="1" <?php echo $session->has('user-split_view_mode') && $session->get('user-split_view_mode') && null !== $session->get('user-split_view_mode') && (int) $session->get('user-split_view_mode') === 1 ? 'selected' : ''; ?>>
441	441	<?php echo $lang->get('yes'); ?>
442	442	</option>
443	443	</select>
		@@ -449,11 +449,11 @@ discard block
		block discarded – undo
449	449	<div class="col-sm-10">
450	450	<select class="form-control" id="profile-user-show_subfolders">
451	451
452		- <option value="0" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && $session->get('user-show_subfolders') === 0 ? 'selected' : '';?>>
	452	+ <option value="0" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && $session->get('user-show_subfolders') === 0 ? 'selected' : ''; ?>>
453	453	<?php echo $lang->get('no'); ?>
454	454	</option>
455	455
456		- <option value="1" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && (int) $session->get('user-show_subfolders') === 1 ? 'selected' : '';?>>
	456	+ <option value="1" <?php echo $session->has('user-show_subfolders') && $session->get('user-show_subfolders') && null !== $session->get('user-show_subfolders') && (int) $session->get('user-show_subfolders') === 1 ? 'selected' : ''; ?>>
457	457	<?php echo $lang->get('yes'); ?>
458	458	</option>
459	459	</select>
		@@ -471,7 +471,7 @@ discard block
		block discarded – undo
471	471	<?php
472	472	}
473	473	if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
474		- echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>';
	474	+ echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>';
475	475	}
476	476	?>
477	477	<div id="profile-avatar-file-container" class="hidden"></div>

nilsteampassnet / TeamPass

Push — master ( 5cf388...378303 )

Status

Category

Spacing +38 added lines, -38 removed lines patch added patch discarded remove patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch