nilsteampassnet / TeamPass

pages/export.php

Spacing +3 added lines, -3 removed lines

@@ -43,16 +43,16 @@
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], curPage($SETTINGS), $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 

error.php

Spacing +7 added lines, -7 removed lines

@@ -54,12 +54,12 @@ 
     && filter_input(INPUT_POST, 'session', FILTER_SANITIZE_STRING) === 'expired'
 ) {
     //Include files
-    require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-    require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
     // connect to DB
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -69,7 +69,7 @@ 
     // Update table by deleting ID
     if (isset($_SESSION['user_id'])) {
         DB::update(
-            DB_PREFIX . 'users',
+            DB_PREFIX.'users',
             [
                 'key_tempo' => '',
             ],
@@ -83,7 +83,7 @@ 
         logEvents($SETTINGS, 'user_connection', 'disconnection', (string) $_SESSION['user_id'], $_SESSION['login']);
     }
 } else {
-    require_once $SETTINGS['cpassman_dir'] . '/sources/main.queries.php';
+    require_once $SETTINGS['cpassman_dir'].'/sources/main.queries.php';
     $errorCode = '';
     if (@$_SESSION['error']['code'] === ERR_NOT_ALLOWED) {
         $errorCode = 'ERROR NOT ALLOWED';

pages/roles.php

Spacing +12 added lines, -12 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'roles', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 
@@ -94,17 +94,17 @@ 
                                 $arrUserRoles = array_filter($_SESSION['user_roles']);
                                 $where = '';
                                 if (count($arrUserRoles) > 0 && (int) $_SESSION['is_admin'] !== 1) {
-                                    $where = ' WHERE id IN (' . implode(',', $arrUserRoles) . ')';
+                                    $where = ' WHERE id IN ('.implode(',', $arrUserRoles).')';
                                 }
-                                $rows = DB::query('SELECT * FROM ' . prefixTable('roles_title') . $where);
+                                $rows = DB::query('SELECT * FROM '.prefixTable('roles_title').$where);
                                 foreach ($rows as $reccord) {
                                     echo '
-                                    <option value="' . $reccord['id'] . '"
-                                        data-complexity-text="' . addslashes(TP_PW_COMPLEXITY[$reccord['complexity']][1]) . '"
-                                        data-complexity-icon="' . TP_PW_COMPLEXITY[$reccord['complexity']][2] . '"
-                                        data-complexity="' . TP_PW_COMPLEXITY[$reccord['complexity']][0] . '"
-                                        data-allow-edit-all="' . $reccord['allow_pw_change'] . '">'.
-                                        $reccord['title'] . '</option>';
+                                    <option value="' . $reccord['id'].'"
+                                        data-complexity-text="' . addslashes(TP_PW_COMPLEXITY[$reccord['complexity']][1]).'"
+                                        data-complexity-icon="' . TP_PW_COMPLEXITY[$reccord['complexity']][2].'"
+                                        data-complexity="' . TP_PW_COMPLEXITY[$reccord['complexity']][0].'"
+                                        data-allow-edit-all="' . $reccord['allow_pw_change'].'">'.
+                                        $reccord['title'].'</option>';
                                 }
                                 ?>
                             </select>
@@ -125,7 +125,7 @@ 
                                         <?php
                                         foreach (TP_PW_COMPLEXITY as $entry) {
                                             echo '
-                                        <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
+                                        <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
                                         }
                                         ?>
                                     </select>

pages/2fa.js.php

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
 }
 echo "ici";
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>

pages/2fa.php

Spacing +4 added lines, -4 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], '2fa', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 
@@ -115,7 +115,7 @@ 
                                     );
                                     foreach ($roles as $role) {
                                         echo '
-                                    <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>';
+                                    <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>';
                                     }
                                     ?>
                                 </select>

pages/actions.php

Spacing +27 added lines, -27 removed lines

@@ -43,15 +43,15 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
 ?>
 
@@ -90,14 +90,14 @@ 
                                 <?php
                                 echo langHdl('rebuild_config_file');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_rebuild_config_file'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -119,14 +119,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_check_pf');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_check_pf'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -146,14 +146,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_db_clean_items');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_db_clean_items'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -175,14 +175,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_db_optimize');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_db_optimize'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -201,14 +201,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_purge_old_files');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_purge_old_files'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -230,14 +230,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_reload_cache_table');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_reload_cache_table'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -260,14 +260,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_change_salt_key');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_change_sk'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {
@@ -290,14 +290,14 @@ 
                                 </span>
                                 <?php echo langHdl('admin_action_attachments_cryption');
 $data = DB::queryfirstrow(
-    'SELECT field_1, date FROM ' . prefixTable('log_system') . '
+    'SELECT field_1, date FROM '.prefixTable('log_system').'
                                     WHERE label = %s
                                     ORDER BY id DESC',
     'admin_action_change_file_encryption'
 );
 if (DB::count() > 0) {
-    $tmp = langHdl('last_execution') . ' ' .
-                                        date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']);
+    $tmp = langHdl('last_execution').' '.
+                                        date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']);
     $tmp .= $data['field_1'] === 'success' ?
                                         '<i class="fas fa-check ml-2 text-success"></i>' : '<i class="fas fa-times ml-2 text-danger"></i>';
 } else {

pages/profile.php

Spacing +36 added lines, -38 removed lines

@@ -43,16 +43,16 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], curPage($SETTINGS), $SETTINGS) === false) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
 // Load template
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 // Prepare GET variables
 $get = [];
@@ -73,25 +73,25 @@ 
 // prepare list of timezones
 $zones = timezone_list();
 // prepare list of languages
-$languages = DB::query('SELECT label FROM ' . prefixTable('languages') . ' ORDER BY label ASC');
+$languages = DB::query('SELECT label 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['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_creation" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userItemsNumber = DB::count();
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_modification" AND  id_user = "' . $_SESSION['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_modification" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userModificationNumber = DB::count();
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_shown" AND  id_user = "' . $_SESSION['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_shown" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userSeenItemsNumber = DB::count();
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_password_shown" AND  id_user = "' . $_SESSION['user_id'] . '"');
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_password_shown" AND  id_user = "'.$_SESSION['user_id'].'"');
 $userSeenPasswordsNumber = DB::count();
 $userInfo = DB::queryFirstRow(
     'SELECT avatar 
-    FROM ' . prefixTable('users') . ' 
-    WHERE id = "' . $_SESSION['user_id'] . '"'
+    FROM ' . prefixTable('users').' 
+    WHERE id = "' . $_SESSION['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
@@ -99,8 +99,8 @@ 
 foreach ($_SESSION['user_roles'] 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']);
@@ -144,7 +144,7 @@ 
                         <h3 id="profile-username" class="text-center">
                             <?php
                             if (isset($_SESSION['name']) === true && empty($_SESSION['name']) === false) {
-                                echo $_SESSION['name'] . ' ' . $_SESSION['lastname'];
+                                echo $_SESSION['name'].' '.$_SESSION['lastname'];
                             } else {
                                 echo $_SESSION['login'];
                             }
@@ -211,7 +211,7 @@ 
                                             } else {
                                                 echo date('d/m/Y', (int) $_SESSION['last_connection']);
                                             }
-                                            echo ' ' . langHdl('at') . ' ';
+                                            echo ' '.langHdl('at').' ';
                                             if (isset($SETTINGS['time_format']) === true) {
                                                 echo date($SETTINGS['time_format'], (int) $_SESSION['last_connection']);
                                             } else {
@@ -221,7 +221,7 @@ 
                                         </a>
                                     </li>
                                     <?php
-                                    if (isset($_SESSION['last_pw_change']) && ! empty($_SESSION['last_pw_change'])) {
+                                    if (isset($_SESSION['last_pw_change']) && !empty($_SESSION['last_pw_change'])) {
                                         // Handle last password change string
                                         if (isset($_SESSION['last_pw_change']) === true) {
                                             if (isset($SETTINGS['date_format']) === true) {
@@ -241,12 +241,12 @@ 
                                         ) {
                                             $numDaysBeforePwExpiration = '';
                                         } else {
-                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $_SESSION['numDaysBeforePwExpiration'] . ' ' . $LANG['days'] . '.';
+                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$_SESSION['numDaysBeforePwExpiration'].' '.$LANG['days'].'.';
                                         }
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('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>' . langHdl('index_last_pw_change').'</b>
+                                        <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
                                     </li>';
                                     }
                                     ?>
@@ -266,7 +266,7 @@ 
                                     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>' . langHdl('user_profile_api_key') . '</b>
+                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key').'</b>
                                         <a class="float-right" id="profile-user-api-token">',
                                             isset($_SESSION['user']['api-key']) === true ? $_SESSION['user']['api-key'] : '',
                                             '</a>
@@ -278,7 +278,7 @@ 
                                     ) {
                                         echo '
                                     <li class="list-group-item">
-                                        <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id') . '</b>
+                                        <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id').'</b>
                                         <a class="float-right">',
                                             $_SESSION['user']['agses-usercardid'] ?? '',
                                             '</a>
@@ -302,7 +302,7 @@ 
                                         <ul class="">
                                             <?php
                                                 foreach ($_SESSION['user']['unsuccessfull_login_attempts_list'] as $entry) {
-                                                    echo '<li class="">' . $entry . '</li>';
+                                                    echo '<li class="">'.$entry.'</li>';
                                                 } ?>
                                         </ul>
                                     </div>
@@ -315,12 +315,12 @@ 
                                         <?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',
@@ -334,9 +334,9 @@ 
                                                 $text = langHdl($record['labelAction']);
                                             }
                                             if (empty($record['NULL']) === false) {
-                                                $text .= ' ' . langHdl('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
+                                                $text .= ' '.langHdl('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>
@@ -374,11 +374,10 @@ 
                                                 <?php
                                                 foreach ($zones as $key => $zone) {
                                                     echo '
-                                                <option value="' . $key . '"',
+                                                <option value="' . $key.'"',
                                                     isset($_SESSION['user']['usertimezone']) === true && $_SESSION['user']['usertimezone'] === $key ?
-                                                    ' selected' :
-                                                    (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
-                                                '>' . $zone . '</option>';
+                                                    ' selected' : (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
+                                                '>'.$zone.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -390,11 +389,10 @@ 
                                             <select class="form-control" id="profile-user-language">
                                                 <?php
                                                 foreach ($languages as $language) {
-                                                    echo '<option value="' . $language['label'] . '"',
+                                                    echo '<option value="'.$language['label'].'"',
                                                     $_SESSION['user']['user_language'] === strtolower($language['label']) ?
-                                                    ' selected="selected"' :
-                                                    ($SETTINGS['default_language'] === strtolower($language['label']) ? ' selected="selected"' : ''),
-                                                '>' . $language['label'] . '</option>';
+                                                    ' selected="selected"' : ($SETTINGS['default_language'] === strtolower($language['label']) ? ' selected="selected"' : ''),
+                                                '>'.$language['label'].'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -445,7 +443,7 @@ 
                                                 <button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo langHdl('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">' . langHdl('generate_api_token') . '</button>';
+                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.langHdl('generate_api_token').'</button>';
                                                 }
                                                 ?>
                                                 <div id="profile-avatar-file-container" class="hidden"></div>

sources/expired.datatables.php

Spacing +29 added lines, -29 removed lines

@@ -28,7 +28,7 @@ 
 require_once 'SecureHandler.php';
 session_name('teampass_session');
 session_start();
-if (! isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || ! isset($_SESSION['key']) || empty($_SESSION['key'])) {
+if (!isset($_SESSION['CPM']) || $_SESSION['CPM'] === false || !isset($_SESSION['key']) || empty($_SESSION['key'])) {
     die('Hacking attempt...');
 }
 
@@ -42,22 +42,22 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'folders', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
 // Connect to mysql server
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -68,9 +68,9 @@ 
 DB::$port = DB_PORT;
 DB::$encoding = DB_ENCODING;
 // Class loader
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 //Build tree
-$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+$tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
 $tree->register();
 $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 //Columns name
@@ -81,22 +81,22 @@ 
 $sOrder = $sLimit = '';
 // Is a date sent?
 if (isset($_GET['dateCriteria']) === true && empty($_GET['dateCriteria']) === false) {
-    $sWhere .= ' AND a.del_value < ' . round(filter_var($_GET['dateCriteria'], FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
+    $sWhere .= ' AND a.del_value < '.round(filter_var($_GET['dateCriteria'], FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
 }
 //echo $sWhere;
 /* BUILD QUERY */
 //Paging
 $sLimit = '';
 if (isset($_GET['length']) === true && (int) $_GET['length'] !== -1) {
-    $sLimit = ' LIMIT ' . filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT) . ', ' . filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT) . '';
+    $sLimit = ' LIMIT '.filter_var($_GET['start'], FILTER_SANITIZE_NUMBER_INT).', '.filter_var($_GET['length'], FILTER_SANITIZE_NUMBER_INT).'';
 }
 
 //Ordering
 if (isset($_GET['order'][0]['dir']) && in_array($_GET['order'][0]['dir'], $aSortTypes)) {
     $sOrder = 'ORDER BY  ';
     if (preg_match('#^(asc|desc)$#i', $_GET['order'][0]['column'])) {
-        $sOrder .= '' . $aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)] . ' '
-            . filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_STRING) . ', ';
+        $sOrder .= ''.$aColumns[filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_NUMBER_INT)].' '
+            . filter_var($_GET['order'][0]['column'], FILTER_SANITIZE_STRING).', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -117,29 +117,29 @@ 
     && $_GET['letter'] !== 'None'
 ) {
     $sWhere .= ' AND ';
-    $sWhere .= $aColumns[1] . " LIKE '" . filter_var($_GET['letter'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . filter_var($_GET['letter'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . filter_var($_GET['letter'], FILTER_SANITIZE_STRING) . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".filter_var($_GET['letter'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".filter_var($_GET['letter'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".filter_var($_GET['letter'], FILTER_SANITIZE_STRING)."%' ";
 } elseif (isset($_GET['search']['value']) === true && $_GET['search']['value'] !== '') {
     $sWhere = ' AND ';
-    $sWhere .= $aColumns[1] . " LIKE '" . filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING) . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING) . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING)."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".filter_var($_GET['search']['value'], FILTER_SANITIZE_STRING)."%' ";
 }
 
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
     $sWhere.
     (string) $sOrder
 );
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
-        $sWhere .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
+        $sWhere.
         $sLimit
 );
 $iFilteredTotal = DB::count();
@@ -157,18 +157,18 @@ 
     // start the line
     $sOutput .= '[';
     // Column 1
-    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"' . $record['item_id'] . '\"  data-item-tree-id=\"' . $record['id_tree'] . '\"></i>", ';
+    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"'.$record['item_id'].'\"  data-item-tree-id=\"'.$record['id_tree'].'\"></i>", ';
     // Column 2
-    $sOutput .= '"' . $record['label'] . '", ';
+    $sOutput .= '"'.$record['label'].'", ';
     // Column 3
-    $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", ';
+    $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", ';
     // Column 4
     $path = [];
     $treeDesc = $tree->getPath($record['id_tree'], true);
     foreach ($treeDesc as $t) {
         array_push($path, $t->title);
     }
-    $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],';
+    $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],';
 }
 
 if ($iTotal > 0) {
@@ -181,4 +181,4 @@ 
 }
 
 // finalize output
-echo '{"recordsTotal": ' . $iTotal . ', "recordsFiltered": ' . $iFilteredTotal . ', "data": ' . $sOutput;
+echo '{"recordsTotal": '.$iTotal.', "recordsFiltered": '.$iFilteredTotal.', "data": '.$sOutput;

sources/utilities.queries.php

Spacing +26 added lines, -26 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.database', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -55,14 +55,14 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
 
 //Connect to DB
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -102,7 +102,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -123,10 +123,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -148,7 +148,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -203,10 +203,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -232,7 +232,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -248,7 +248,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -333,10 +333,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -368,7 +368,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -382,7 +382,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -478,7 +478,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE action=%s ' .  'AND date BETWEEN %i AND %i'
                         . ($post_filter_action === 'all' ? '' : ' AND action = %s')
                         . ($post_filter_user === -1 ? '' : ' AND id_user = %i'),
@@ -500,7 +500,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'user_connection',
                         $post_date_from,
@@ -517,7 +517,7 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'error',
                         $post_date_from,
@@ -534,7 +534,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND date BETWEEN %i AND %i',
                         'at_copy',
                         $post_date_from,
@@ -551,7 +551,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'admin_action',
                         $post_date_from,
@@ -568,7 +568,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND date BETWEEN %i AND %i',
                         'failed_auth',
                         $post_date_from,