Inspection of "2e0cc8ee2749ad39b7fe4bdfec7cac59d7a22f6e" - nilsteampassnet/TeamPass - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Branch — wip_sessions (2e0cc8)

by Nils

created 2024-01-06 07:19 UTC

Status

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

@@ -66,7 +66,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;
 }
 
@@ -98,25 +98,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
@@ -124,8 +124,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']);
@@ -169,7 +169,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');
                             }
@@ -237,7 +237,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 {
@@ -247,7 +247,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 (null !== $session->get('user-last_pw_change')) {
                                             if (isset($SETTINGS['date_format']) === true) {
@@ -267,12 +267,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>';
                                     }
                                     ?>
@@ -292,7 +292,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>
                                         <a class="float-right" id="profile-user-api-token">',
                                             null !== $session->get('user-api_key') ? $session->get('user-api_key') : '',
                                         '</a>
@@ -328,7 +328,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>
@@ -341,12 +341,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',
@@ -360,9 +360,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>
@@ -400,11 +400,10 @@  discard block
 block discarded – undo
                                                 <?php
                                                 foreach ($zones as $key => $zone) {
                                                     echo '
-                                                <option value="' . $key . '"',
+                                                <option value="' . $key.'"',
                                                     null !== $session->get('user-timezone') && $session->get('user-timezone') === $key ?
-                                                    ' selected' :
-                                                    (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
-                                                '>' . $zone . '</option>';
+                                                    ' selected' : (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
+                                                '>'.$zone.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -416,10 +415,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>
@@ -431,11 +430,11 @@  discard block
 block discarded – undo
                                         <div class="col-sm-10">
                                             <select class="form-control" id="profile-user-treeloadstrategy">
                                                 
-                                                <option value="sequential" <?php echo null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'sequential' ? ' selected' : '';?>>
+                                                <option value="sequential" <?php echo 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 null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : '';?>>
+                                                <option value="full" <?php echo null !== $session->get('user-tree_load_strategy') && $session->get('user-tree_load_strategy') === 'full' ? ' selected' : ''; ?>>
                                                     <?php echo $lang->get('full'); ?>
                                                 </option>
                                             </select>
@@ -470,7 +469,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.

pages/favorites.js.php 1 patch

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

@@ -68,7 +68,7 @@
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('favourites') === 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;
 }
 ?>

Please login to merge, or discard this patch.

pages/tasks.php 1 patch

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

@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === 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;
 }
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
                                             $task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="users_personal_folder_task">
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
                                             $task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="clean_orphan_objects_task">
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
                                             $task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="purge_temporary_files_task">
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
                                             $task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="reload_cache_table_task">
@@ -506,7 +506,7 @@  discard block
 block discarded – undo
                         <h5><?php echo $lang->get('day_of_month'); ?></h5>              
                         <select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;">
                             <?php
-                            for ($i=1; $i<=31; $i++) {
+                            for ($i = 1; $i <= 31; $i++) {
                                 echo '<option value="'.$i.'">'.$lang->get('day').' '.$i.'</option>';
                             }
                             ?>

Please login to merge, or discard this patch.

pages/export.php 1 patch

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

@@ -65,7 +65,7 @@
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('export') === 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;
 }
 

Please login to merge, or discard this patch.

pages/ldap.php 1 patch

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

@@ -66,7 +66,7 @@
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('ldap') === 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;
 }
 

Please login to merge, or discard this patch.

pages/api.js.php 1 patch

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

@@ -68,7 +68,7 @@
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('api') === 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;
 }
 ?>

Please login to merge, or discard this patch.

pages/backups.js.php 1 patch

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

@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === 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;
 }
 ?>
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
                             // ERROR
                             toastr.remove();
                             toastr.error(
-                                '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                                '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                                 '<?php echo $lang->get('error'); ?>', {
                                     timeOut: 5000,
                                     progressBar: true
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
                                         // error
                                         toastr.remove();
                                         toastr.error(
-                                            '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                                            '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                                             '<?php echo $lang->get('error'); ?>', {
                                                 timeOut: 5000,
                                                 progressBar: true
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
                             // ERROR
                             toastr.remove();
                             toastr.error(
-                                '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                                '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                                 '<?php echo $lang->get('error'); ?>', {
                                     timeOut: 5000,
                                     progressBar: true
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
             container: "onthefly-restore-file",
             max_file_size: '<?php
             if (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) {
-                echo $SETTINGS['upload_maxfilesize'] . 'mb';
+                echo $SETTINGS['upload_maxfilesize'].'mb';
             } else {
                 echo $SETTINGS['upload_maxfilesize'];
             }

Please login to merge, or discard this patch.

pages/utilities.deletion.php 1 patch

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

@@ -65,7 +65,7 @@
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.deletion') === 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;
 }
 

Please login to merge, or discard this patch.

pages/ldap.js.php 1 patch

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

@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('ldap') === 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;
 }
 ?>
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
                     if (data[i].selected_role === 1) {
                         selected_role = data[i].id;
                     }
-                    html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of') . ' '; ?>' + data[i].title + '</option>';
+                    html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of').' '; ?>' + data[i].title + '</option>';
                     html_roles += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
                 }
                 $("#ldap_new_user_is_administrated_by").append(html_admin_by);

Please login to merge, or discard this patch.

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

		@@ -68,7 +68,7 @@
		block discarded – undo
68	68	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('favourites') === 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	?>

		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('tasks') === false) {
60	60	// Not allowed page
61	61	$session->set('system-error_code', ERR_NOT_ALLOWED);
62		- include $SETTINGS['cpassman_dir'] . '/error.php';
	62	+ include $SETTINGS['cpassman_dir'].'/error.php';
63	63	exit;
64	64	}
65	65
		@@ -219,7 +219,7 @@ discard block
		block discarded – undo
219	219	$task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : [];
220	220	?>
221	221	<input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
222		- <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
	222	+ <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
223	223	</div>
224	224	<div class='col-2'>
225	225	<button class="btn btn-primary task-define" data-task="users_personal_folder_task">
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	$task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : [];
248	248	?>
249	249	<input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
250		- <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
	250	+ <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
251	251	</div>
252	252	<div class='col-2'>
253	253	<button class="btn btn-primary task-define" data-task="clean_orphan_objects_task">
		@@ -269,7 +269,7 @@ discard block
		block discarded – undo
269	269	$task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : [];
270	270	?>
271	271	<input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
272		- <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
	272	+ <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
273	273	</div>
274	274	<div class='col-2'>
275	275	<button class="btn btn-primary task-define" data-task="purge_temporary_files_task">
		@@ -313,7 +313,7 @@ discard block
		block discarded – undo
313	313	$task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : [];
314	314	?>
315	315	<input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".$task[1] : $lang->get('not_defined') ?>'>
316		- <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : '';?>'>
	316	+ <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".$task[1].(isset($task[2]) === true ? ';'.$task[2] : '') : ''; ?>'>
317	317	</div>
318	318	<div class='col-2'>
319	319	<button class="btn btn-primary task-define" data-task="reload_cache_table_task">
		@@ -506,7 +506,7 @@ discard block
		block discarded – undo
506	506	<h5><?php echo $lang->get('day_of_month'); ?></h5>
507	507	<select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;">
508	508	<?php
509		- for ($i=1; $i<=31; $i++) {
	509	+ for ($i = 1; $i <= 31; $i++) {
510	510	echo '<option value="'.$i.'">'.$lang->get('day').' '.$i.'</option>';
511	511	}
512	512	?>

		@@ -65,7 +65,7 @@
		block discarded – undo
65	65	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('export') === false) {
66	66	// Not allowed page
67	67	$session->set('system-error_code', ERR_NOT_ALLOWED);
68		- include $SETTINGS['cpassman_dir'] . '/error.php';
	68	+ include $SETTINGS['cpassman_dir'].'/error.php';
69	69	exit;
70	70	}
71	71

		@@ -66,7 +66,7 @@
		block discarded – undo
66	66	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('ldap') === false) {
67	67	// Not allowed page
68	68	$session->set('system-error_code', ERR_NOT_ALLOWED);
69		- include $SETTINGS['cpassman_dir'] . '/error.php';
	69	+ include $SETTINGS['cpassman_dir'].'/error.php';
70	70	exit;
71	71	}
72	72

		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('backups') === 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	?>
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	// ERROR
137	137	toastr.remove();
138	138	toastr.error(
139		- '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
	139	+ '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
140	140	'<?php echo $lang->get('error'); ?>', {
141	141	timeOut: 5000,
142	142	progressBar: true
		@@ -163,7 +163,7 @@ discard block
		block discarded – undo
163	163	// error
164	164	toastr.remove();
165	165	toastr.error(
166		- '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
	166	+ '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
167	167	'<?php echo $lang->get('error'); ?>', {
168	168	timeOut: 5000,
169	169	progressBar: true
		@@ -234,7 +234,7 @@ discard block
		block discarded – undo
234	234	// ERROR
235	235	toastr.remove();
236	236	toastr.error(
237		- '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
	237	+ '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
238	238	'<?php echo $lang->get('error'); ?>', {
239	239	timeOut: 5000,
240	240	progressBar: true
		@@ -275,7 +275,7 @@ discard block
		block discarded – undo
275	275	container: "onthefly-restore-file",
276	276	max_file_size: '<?php
277	277	if (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) {
278		- echo $SETTINGS['upload_maxfilesize'] . 'mb';
	278	+ echo $SETTINGS['upload_maxfilesize'].'mb';
279	279	} else {
280	280	echo $SETTINGS['upload_maxfilesize'];
281	281	}

		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	if ($checkUserAccess->checkSession() === false \|\| $checkUserAccess->userAccessPage('ldap') === 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	?>
		@@ -159,7 +159,7 @@ discard block
		block discarded – undo
159	159	if (data[i].selected_role === 1) {
160	160	selected_role = data[i].id;
161	161	}
162		- html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of') . ' '; ?>' + data[i].title + '</option>';
	162	+ html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of').' '; ?>' + data[i].title + '</option>';
163	163	html_roles += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
164	164	}
165	165	$("#ldap_new_user_is_administrated_by").append(html_admin_by);

nilsteampassnet / TeamPass

Branch — wip_sessions (2e0cc8)

Status

Category

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

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

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

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

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

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

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

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

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