Inspection of "Profile fixes" - nilsteampassnet/TeamPass - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#4377)

by Evertton

created 2024-09-30 00:47 UTC

Status

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

@@ -50,18 +50,18 @@  discard block
 block discarded – undo
         // Get items
         $rows = DB::query(
             '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
+            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 ". $limit : '')
+            $sqlExtra. 
+            " ORDER BY i.id ASC".
+            ($limit > 0 ? " LIMIT ".$limit : '')
         );
 
         $ret = [];
         foreach ($rows as $row) {
             $userKey = DB::queryfirstrow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $userId,
                 $row['id']
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
                 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);
                 }
             }
 
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
     ) : array
     {
         try {
-            include_once API_ROOT_PATH . '/../sources/main.functions.php';
+            include_once API_ROOT_PATH.'/../sources/main.functions.php';
 
             // Load config
             $configManager = new ConfigManager();
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
         }
 
         if (strlen($password) > $SETTINGS['pwd_maximum_length']) {
-            throw new Exception('Password is too long (max allowed is ' . $SETTINGS['pwd_maximum_length'] . ' characters)');
+            throw new Exception('Password is too long (max allowed is '.$SETTINGS['pwd_maximum_length'].' characters)');
         }
     }
 
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
     {
         $dataFolderSettings = DB::queryFirstRow(
             'SELECT bloquer_creation, bloquer_modification, personal_folder
-            FROM ' . prefixTable('nested_tree') . ' 
+            FROM ' . prefixTable('nested_tree').' 
             WHERE id = %i',
             $folderId
         );
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
     {
         $folderComplexity = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule = %i',
             'complex',
             $itemInfos['folderId']
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
     private function checkForDuplicates(string $label, array $SETTINGS, array $itemInfos) : void
     {
         DB::queryFirstRow(
-            'SELECT * FROM ' . prefixTable('items') . '
+            'SELECT * FROM '.prefixTable('items').'
             WHERE label = %s AND inactif = %i',
             $label,
             0

Please login to merge, or discard this patch.

pages/profile.php 2 patches

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

@@ -67,7 +67,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;
 }
 
@@ -99,25 +99,25 @@  discard block
 block discarded – undo
 // prepare list of timezones
 $zones = timezone_list();
 // prepare list of languages
-$languages = DB::query('SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC');
+$languages = DB::query('SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC');
 // Do some stats
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_creation" AND  id_user = "' . $session->get('user-id') . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_creation" AND  id_user = "'.$session->get('user-id').'"');
 $userItemsNumber = DB::count();
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_modification" AND  id_user = "' . $session->get('user-id') . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_modification" AND  id_user = "'.$session->get('user-id').'"');
 $userModificationNumber = DB::count();
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_shown" AND  id_user = "' . $session->get('user-id') . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_shown" AND  id_user = "'.$session->get('user-id').'"');
 $userSeenItemsNumber = DB::count();
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_password_shown" AND  id_user = "' . $session->get('user-id') . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_password_shown" AND  id_user = "'.$session->get('user-id').'"');
 $userSeenPasswordsNumber = DB::count();
 $userInfo = DB::queryFirstRow(
     'SELECT avatar, last_pw_change
-    FROM ' . prefixTable('users') . ' 
-    WHERE id = "' . $session->get('user-id') . '"'
+    FROM ' . prefixTable('users').' 
+    WHERE id = "' . $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
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
 foreach ($session->get('user-roles_array') as $role) {
     $tmp = DB::queryFirstRow(
         'SELECT title 
-        FROM ' . prefixTable('roles_title') . ' 
-        WHERE id = "' . $role . '"'
+        FROM ' . prefixTable('roles_title').' 
+        WHERE id = "' . $role.'"'
     );
     if ($tmp !== null) {
         array_push($userParOfGroups, $tmp['title']);
@@ -170,7 +170,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');
                             }
@@ -238,7 +238,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 {
@@ -248,7 +248,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) {
@@ -268,12 +268,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>';
                                     }
                                     ?>
@@ -293,7 +293,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') : '',
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
                                         <ul class="">
                                             <?php
                                                 foreach ($session->get('user-unsuccessfull_login_attempts_list') as $entry) {
-                                                    echo '<li class="">' . $entry . '</li>';
+                                                    echo '<li class="">'.$entry.'</li>';
                                                 } ?>
                                         </ul>
                                     </div>
@@ -343,12 +343,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',
@@ -362,9 +362,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>
@@ -396,13 +396,13 @@  discard block
 block discarded – undo
                                     </div>
 
                                     <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)
@@ -418,10 +418,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-treeloadstrategy">
                                                 
-                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>>
+                                                <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : ''; ?>>
                                                     <?php echo $lang->get('sequential'); ?>
                                                 </option>
                                                 
-                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>>
+                                                <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>>
                                                     <?php echo $lang->get('full'); ?>
                                                 </option>
                                             </select>
@@ -449,11 +449,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>
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
                                                 <button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo $lang->get('upload_new_avatar'); ?></button>
                                                 <?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.

Braces +5 added lines, -4 removed lines patch added patch discarded remove patch

@@ -401,12 +401,13 @@
 block discarded – undo
                                             <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->has('user-timezone')) {
+                                                                                                                    if($session->get('user-timezone') === $key)
                                                                 echo ' selected';
-                                                            elseif ($session->get('user-timezone') === 'not_defined')
-                                                                if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
+                                                        } elseif ($session->get('user-timezone') === 'not_defined') {
+                                                                                                                            if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
                                                                     echo ' selected';
+                                                            }
                                                     ?>><?php echo $zone; ?></option>
                                                 <?php endforeach; ?>
                                             </select>

Please login to merge, or discard this patch.

		@@ -50,18 +50,18 @@ discard block
		block discarded – undo
50	50	// Get items
51	51	$rows = DB::query(
52	52	'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
53		- FROM ' . prefixTable('items') . ' AS i
	53	+ FROM ' . prefixTable('items').' AS i
54	54	LEFT JOIN '.prefixTable('nested_tree').' as t ON (t.id = i.id_tree) '.
55		- $sqlExtra .
56		- " ORDER BY i.id ASC" .
57		- ($limit > 0 ? " LIMIT ". $limit : '')
	55	+ $sqlExtra.
	56	+ " ORDER BY i.id ASC".
	57	+ ($limit > 0 ? " LIMIT ".$limit : '')
58	58	);
59	59
60	60	$ret = [];
61	61	foreach ($rows as $row) {
62	62	$userKey = DB::queryfirstrow(
63	63	'SELECT share_key
64		- FROM ' . prefixTable('sharekeys_items') . '
	64	+ FROM ' . prefixTable('sharekeys_items').'
65	65	WHERE user_id = %i AND object_id = %i',
66	66	$userId,
67	67	$row['id']
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	if (empty($path) === true) {
99	99	$path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
100	100	} else {
101		- $path .= '/' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
	101	+ $path .= '/'.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
102	102	}
103	103	}
104	104
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	) : array
149	149	{
150	150	try {
151		- include_once API_ROOT_PATH . '/../sources/main.functions.php';
	151	+ include_once API_ROOT_PATH.'/../sources/main.functions.php';
152	152
153	153	// Load config
154	154	$configManager = new ConfigManager();
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	}
272	272
273	273	if (strlen($password) > $SETTINGS['pwd_maximum_length']) {
274		- throw new Exception('Password is too long (max allowed is ' . $SETTINGS['pwd_maximum_length'] . ' characters)');
	274	+ throw new Exception('Password is too long (max allowed is '.$SETTINGS['pwd_maximum_length'].' characters)');
275	275	}
276	276	}
277	277
		@@ -284,7 +284,7 @@ discard block
		block discarded – undo
284	284	{
285	285	$dataFolderSettings = DB::queryFirstRow(
286	286	'SELECT bloquer_creation, bloquer_modification, personal_folder
287		- FROM ' . prefixTable('nested_tree') . '
	287	+ FROM ' . prefixTable('nested_tree').'
288	288	WHERE id = %i',
289	289	$folderId
290	290	);
		@@ -307,7 +307,7 @@ discard block
		block discarded – undo
307	307	{
308	308	$folderComplexity = DB::queryFirstRow(
309	309	'SELECT valeur
310		- FROM ' . prefixTable('misc') . '
	310	+ FROM ' . prefixTable('misc').'
311	311	WHERE type = %s AND intitule = %i',
312	312	'complex',
313	313	$itemInfos['folderId']
		@@ -335,7 +335,7 @@ discard block
		block discarded – undo
335	335	private function checkForDuplicates(string $label, array $SETTINGS, array $itemInfos) : void
336	336	{
337	337	DB::queryFirstRow(
338		- 'SELECT * FROM ' . prefixTable('items') . '
	338	+ 'SELECT * FROM '.prefixTable('items').'
339	339	WHERE label = %s AND inactif = %i',
340	340	$label,
341	341	0

		@@ -401,12 +401,13 @@
		block discarded – undo
401	401	<select class="form-control" id="profile-user-timezone">
402	402	<?php foreach ($zones as $key => $zone): ?>
403	403	<option value="<?php echo $key; ?>"<?php
404		- if ($session->has('user-timezone'))
405		- if($session->get('user-timezone') === $key)
	404	+ if ($session->has('user-timezone')) {
	405	+ if($session->get('user-timezone') === $key)
406	406	echo ' selected';
407		- elseif ($session->get('user-timezone') === 'not_defined')
408		- if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
	407	+ } elseif ($session->get('user-timezone') === 'not_defined') {
	408	+ if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
409	409	echo ' selected';
	410	+ }
410	411	?>><?php echo $zone; ?></option>
411	412	<?php endforeach; ?>
412	413	</select>

		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('profile') === false) {
68	68	// Not allowed page
69	69	$session->set('system-error_code', ERR_NOT_ALLOWED);
70		- include $SETTINGS['cpassman_dir'] . '/error.php';
	70	+ include $SETTINGS['cpassman_dir'].'/error.php';
71	71	exit;
72	72	}
73	73
		@@ -99,25 +99,25 @@ discard block
		block discarded – undo
99	99	// prepare list of timezones
100	100	$zones = timezone_list();
101	101	// prepare list of languages
102		-$languages = DB::query('SELECT label, name FROM ' . prefixTable('languages') . ' ORDER BY label ASC');
	102	+$languages = DB::query('SELECT label, name FROM '.prefixTable('languages').' ORDER BY label ASC');
103	103	// Do some stats
104		-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_creation" AND id_user = "' . $session->get('user-id') . '"');
	104	+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_creation" AND id_user = "'.$session->get('user-id').'"');
105	105	$userItemsNumber = DB::count();
106		-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_modification" AND id_user = "' . $session->get('user-id') . '"');
	106	+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_modification" AND id_user = "'.$session->get('user-id').'"');
107	107	$userModificationNumber = DB::count();
108		-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_shown" AND id_user = "' . $session->get('user-id') . '"');
	108	+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_shown" AND id_user = "'.$session->get('user-id').'"');
109	109	$userSeenItemsNumber = DB::count();
110		-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_password_shown" AND id_user = "' . $session->get('user-id') . '"');
	110	+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_password_shown" AND id_user = "'.$session->get('user-id').'"');
111	111	$userSeenPasswordsNumber = DB::count();
112	112	$userInfo = DB::queryFirstRow(
113	113	'SELECT avatar, last_pw_change
114		- FROM ' . prefixTable('users') . '
115		- WHERE id = "' . $session->get('user-id') . '"'
	114	+ FROM ' . prefixTable('users').'
	115	+ WHERE id = "' . $session->get('user-id').'"'
116	116	);
117	117	if (empty($userInfo['avatar']) === true) {
118		- $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
	118	+ $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
119	119	} else {
120		- $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
	120	+ $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
121	121	}
122	122
123	123	// Get Groups name
		@@ -125,8 +125,8 @@ discard block
		block discarded – undo
125	125	foreach ($session->get('user-roles_array') as $role) {
126	126	$tmp = DB::queryFirstRow(
127	127	'SELECT title
128		- FROM ' . prefixTable('roles_title') . '
129		- WHERE id = "' . $role . '"'
	128	+ FROM ' . prefixTable('roles_title').'
	129	+ WHERE id = "' . $role.'"'
130	130	);
131	131	if ($tmp !== null) {
132	132	array_push($userParOfGroups, $tmp['title']);
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170	<h3 id="profile-username" class="text-center">
171	171	<?php
172	172	if (null !== $session->get('user-name') && empty($session->get('user-name')) === false) {
173		- echo $session->get('user-name') . ' ' . $session->get('user-lastname');
	173	+ echo $session->get('user-name').' '.$session->get('user-lastname');
174	174	} else {
175	175	echo $session->get('user-login');
176	176	}
		@@ -238,7 +238,7 @@ discard block
		block discarded – undo
238	238	} else {
239	239	echo date('d/m/Y', (int) $session->get('user-last_connection'));
240	240	}
241		- echo ' ' . $lang->get('at') . ' ';
	241	+ echo ' '.$lang->get('at').' ';
242	242	if (isset($SETTINGS['time_format']) === true) {
243	243	echo date($SETTINGS['time_format'], (int) $session->get('user-last_connection'));
244	244	} else {
		@@ -248,7 +248,7 @@ discard block
		block discarded – undo
248	248	</a>
249	249	</li>
250	250	<?php
251		- if (null !== $session->get('user-last_pw_change') && ! empty($session->get('user-last_pw_change') === true)) {
	251	+ if (null !== $session->get('user-last_pw_change') && !empty($session->get('user-last_pw_change') === true)) {
252	252	// Handle last password change string
253	253	if ($session->has('user-last_pw_change') && null !== $session->get('user-last_pw_change')) {
254	254	if (isset($SETTINGS['date_format']) === true) {
		@@ -268,12 +268,12 @@ discard block
		block discarded – undo
268	268	) {
269	269	$numDaysBeforePwExpiration = '';
270	270	} else {
271		- $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $session->get('user-num_days_before_exp') . ' ' . $LANG['days'] . '.';
	271	+ $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$session->get('user-num_days_before_exp').' '.$LANG['days'].'.';
272	272	}
273	273	echo '
274	274	<li class="list-group-item">
275		- <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change') . '</b>
276		- <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
	275	+ <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . $lang->get('index_last_pw_change').'</b>
	276	+ <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
277	277	</li>';
278	278	}
279	279	?>
		@@ -293,7 +293,7 @@ discard block
		block discarded – undo
293	293	if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
294	294	echo '
295	295	<li class="list-group-item">
296		- <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key') . '</b>
	296	+ <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . $lang->get('user_profile_api_key').'</b>
297	297	<button class="btn btn-sm btn-primary float-right" id="copy-api-key"><i class="fa-regular fa-copy pointer"></i></button>
298	298	<a class="float-right mr-2" id="profile-user-api-token">',
299	299	null !== $session->get('user-api_key') ? $session->get('user-api_key') : '',
		@@ -330,7 +330,7 @@ discard block
		block discarded – undo
330	330	<ul class="">
331	331	<?php
332	332	foreach ($session->get('user-unsuccessfull_login_attempts_list') as $entry) {
333		- echo '<li class="">' . $entry . '</li>';
	333	+ echo '<li class="">'.$entry.'</li>';
334	334	} ?>
335	335	</ul>
336	336	</div>
		@@ -343,12 +343,12 @@ discard block
		block discarded – undo
343	343	<?php
344	344	$rows = DB::query(
345	345	'SELECT label AS labelAction, date, null
346		- FROM ' . prefixTable('log_system') . '
	346	+ FROM ' . prefixTable('log_system').'
347	347	WHERE qui = %i
348	348	UNION
349	349	SELECT l.action, l.date, i.label AS itemLabel
350		- FROM ' . prefixTable('log_items') . ' AS l
351		- INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
	350	+ FROM ' . prefixTable('log_items').' AS l
	351	+ INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
352	352	WHERE l.id_user = %i AND l.action IN ("at_access")
353	353	ORDER BY date DESC
354	354	LIMIT 0, 40',
		@@ -362,9 +362,9 @@ discard block
		block discarded – undo
362	362	$text = $lang->get($record['labelAction']);
363	363	}
364	364	if (empty($record['NULL']) === false) {
365		- $text .= ' ' . $lang->get('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
	365	+ $text .= ' '.$lang->get('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
366	366	}
367		- echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>';
	367	+ echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>';
368	368	}
369	369	?>
370	370	</ul>
		@@ -396,13 +396,13 @@ discard block
		block discarded – undo
396	396	</div>
397	397
398	398	<div class="form-group">
399		- <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection');?></label>
	399	+ <label class="col-sm-10 control-label"><?php echo $lang->get('timezone_selection'); ?></label>
400	400	<div class="col-sm-10">
401	401	<select class="form-control" id="profile-user-timezone">
402	402	<?php foreach ($zones as $key => $zone): ?>
403	403	<option value="<?php echo $key; ?>"<?php
404	404	if ($session->has('user-timezone'))
405		- if($session->get('user-timezone') === $key)
	405	+ if ($session->get('user-timezone') === $key)
406	406	echo ' selected';
407	407	elseif ($session->get('user-timezone') === 'not_defined')
408	408	if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
		@@ -418,10 +418,10 @@ discard block
		block discarded – undo
418	418	<select class="form-control" id="profile-user-language">
419	419	<?php
420	420	foreach ($languages as $language) {
421		- echo '<option value="' . $language['name'] . '"',
	421	+ echo '<option value="'.$language['name'].'"',
422	422	strtolower($session->get('user-language')) === strtolower($language['name']) ?
423	423	' selected="selected"' : '',
424		- '>' . $language['label'] . '</option>';
	424	+ '>'.$language['label'].'</option>';
425	425	}
426	426	?>
427	427	</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-treeloadstrategy">
435	435
436		- <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>>
	436	+ <option value="sequential" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : ''; ?>>
437	437	<?php echo $lang->get('sequential'); ?>
438	438	</option>
439	439
440		- <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>>
	440	+ <option value="full" <?php echo $session->has('user-tree_load_strategy') && $session->get('user-tree_load_strategy') && null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>>
441	441	<?php echo $lang->get('full'); ?>
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-split_view_mode">
451	451
452		- <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' : '';?>>
	452	+ <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' : ''; ?>>
453	453	<?php echo $lang->get('no'); ?>
454	454	</option>
455	455
456		- <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' : '';?>>
	456	+ <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' : ''; ?>>
457	457	<?php echo $lang->get('yes'); ?>
458	458	</option>
459	459	</select>
		@@ -488,7 +488,7 @@ discard block
		block discarded – undo
488	488	<button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo $lang->get('upload_new_avatar'); ?></button>
489	489	<?php
490	490	if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
491		- echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . $lang->get('generate_api_token') . '</button>';
	491	+ echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.$lang->get('generate_api_token').'</button>';
492	492	}
493	493	?>
494	494	<div id="profile-avatar-file-container" class="hidden"></div>

nilsteampassnet / TeamPass

Pull Request — master (#4377)

Status

Category

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

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

Braces +5 added lines, -4 removed lines patch added patch discarded remove patch