nilsteampassnet / TeamPass

api/inc/jwt_utils.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
     return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
 }
 
-function get_authorization_header(){
+function get_authorization_header() {
 	$superGlobal = new SuperGlobal();
 	$headers = null;
 	

api/Model/AuthModel.php

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
 
-require_once API_ROOT_PATH . "/Model/Database.php";
+require_once API_ROOT_PATH."/Model/Database.php";
 
 
 class AuthModel extends Database
@@ -45,7 +45,7 @@ 
     public function getUserAuth(string $login, string $password, string $apikey): array
     {
         // Sanitize
-        include_once API_ROOT_PATH . '/../sources/main.functions.php';
+        include_once API_ROOT_PATH.'/../sources/main.functions.php';
         $inputData = dataSanitizer(
             [
                 'login' => isset($login) === true ? $login : '',
@@ -57,7 +57,7 @@ 
                 'password' => 'trim|escape',
                 'apikey' => 'trim|escape',
             ],
-            API_ROOT_PATH . '/..'
+            API_ROOT_PATH.'/..'
         );
         if (empty($inputData['login']) === true || empty($inputData['apikey']) === true) {
             return ["error" => "Login failed0.", "info" => "Empty entry"];
@@ -66,7 +66,7 @@ 
         // Check apikey
         if (empty($inputData['password']) === true) {
             // case where it is a generic key
-            $apiInfo = $this->select("SELECT count(*) FROM " . prefixTable('api') . " WHERE value='".$inputData['apikey']."' AND label='".$inputData['login']."'");
+            $apiInfo = $this->select("SELECT count(*) FROM ".prefixTable('api')." WHERE value='".$inputData['apikey']."' AND label='".$inputData['login']."'");
             if ((int) $apiInfo[0]['count(*)'] === 0) {
                 return ["error" => "Login failed1.", "info" => "apikey : Not valid"];
             }
@@ -77,8 +77,8 @@ 
             // Check if user exists
             $userInfoRes = $this->select(
                 "SELECT u.id, u.pw, u.public_key, u.private_key, u.personal_folder, u.fonction_id, u.groupes_visibles, u.groupes_interdits, a.value AS user_api_key
-                FROM " . prefixTable('users') . " AS u
-                INNER JOIN " . prefixTable('api') . " AS a ON (a.user_id=u.id)
+                FROM " . prefixTable('users')." AS u
+                INNER JOIN " . prefixTable('api')." AS a ON (a.user_id=u.id)
                 WHERE login='".$inputData['login']."'");
             if (count($userInfoRes) === 0) {
                 return ["error" => "Login failed3.", "info" => "apikey : Not valid"];
@@ -131,7 +131,7 @@ 
      */
     private function createUserJWT(int $id, string $login, int $pf_enabled, string $pubkey, string $privkey, string $folders, string $items): array
     {
-        include API_ROOT_PATH . '/../includes/config/tp.config.php';
+        include API_ROOT_PATH.'/../includes/config/tp.config.php';
         
 		$payload = [
             'username' => $login,
@@ -175,7 +175,7 @@ 
 
         // Get folders from the roles
         if (empty($userFunctionId) === false) {
-            $rows = $this->select("SELECT * FROM " . prefixTable('roles_values') . " WHERE role_id IN (".$userFunctionId.") AND type IN ('W', 'ND', 'NE', 'NDNE', 'R')");
+            $rows = $this->select("SELECT * FROM ".prefixTable('roles_values')." WHERE role_id IN (".$userFunctionId.") AND type IN ('W', 'ND', 'NE', 'NDNE', 'R')");
             foreach ($rows as $record) {
                 if ($record['type'] === 'R') {
                     array_push($readOnlyFolders, $record['folder_id']);
@@ -196,7 +196,7 @@ 
         
         // Does this user is allowed to see other items
         $inc = 0;
-        $rows = $this->select("SELECT id, id_tree FROM " . prefixTable('items') . " WHERE restricted_to LIKE '".$userInfo['id']."'".
+        $rows = $this->select("SELECT id, id_tree FROM ".prefixTable('items')." WHERE restricted_to LIKE '".$userInfo['id']."'".
             (empty($userFunctionId) === false ? ' AND id_tree NOT IN ('.$userFunctionId.')' : ''));
         foreach ($rows as $record) {
             // Exclude restriction on item if folder is fully accessible
@@ -206,8 +206,8 @@ 
 
         // Check for the users roles if some specific rights exist on items
         $rows = $this->select("SELECT i.id_tree, r.item_id
-            FROM " . prefixTable('items') . " as i
-            INNER JOIN " . prefixTable('restriction_to_roles') . " as r ON (r.item_id=i.id)
+            FROM " . prefixTable('items')." as i
+            INNER JOIN " . prefixTable('restriction_to_roles')." as r ON (r.item_id=i.id)
             WHERE ".(empty($userFunctionId) === false ? ' id_tree NOT IN ('.$userFunctionId.') AND ' : '')." i.id_tree != ''
             ORDER BY i.id_tree ASC");
         foreach ($rows as $record) {
@@ -221,7 +221,7 @@ 
         // Add all personal folders
         $rows = $this->select(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = '.$userInfo['id'].' AND personal_folder = 1'.
             (empty($userFunctionId) === false ? ' AND id NOT IN ('.$userFunctionId.')' : '').
             ' LIMIT 0,1'

scripts/background_tasks___user_task.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 DB::debugmode(false);
 $rows = DB::query(
     'SELECT *
-    FROM ' . prefixTable('processes') . '
+    FROM ' . prefixTable('processes').'
     WHERE is_in_progress = %i AND process_type = %s
     ORDER BY increment_id ASC LIMIT 0,10',
     0,

scripts/background_tasks___functions.php

Spacing +5 added lines, -5 removed lines

@@ -90,10 +90,10 @@ 
  */
 function provideLog(string $message, array $SETTINGS)
 {
-    echo '\n' . (string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message . '\n';
+    echo '\n'.(string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message.'\n';
 }
 
-function performVisibleFoldersHtmlUpdate (int $user_id)
+function performVisibleFoldersHtmlUpdate(int $user_id)
 {
     $html = [];
 
@@ -103,10 +103,10 @@ 
 
     // get current folders visible for user
     $cache_tree = DB::queryFirstRow(
-        'SELECT increment_id, data FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+        'SELECT increment_id, data FROM '.prefixTable('cache_tree').' WHERE user_id = %i',
         $user_id
     );
-    $folders = json_decode($cache_tree['data'], true);//print_r($folders);
+    $folders = json_decode($cache_tree['data'], true); //print_r($folders);
     foreach ($folders as $folder) {
         $idFolder = (int) explode("li_", $folder['id'])[1];
 
@@ -119,7 +119,7 @@ 
 
         // get folder info
         $folder = DB::queryFirstRow(
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $idFolder
         );
 

pages/statistics.php

Spacing +1 added lines, -1 removed lines

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

pages/profile.js.php

Spacing +15 added lines, -15 removed lines

@@ -71,7 +71,7 @@ 
 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;
 }
 ?>
@@ -95,7 +95,7 @@ 
     })
 
     // Select user properties
-    $('#profile-user-language option[value=<?php echo $session->get('user-language');?>').attr('selected','selected');
+    $('#profile-user-language option[value=<?php echo $session->get('user-language'); ?>').attr('selected','selected');
 
 
     // AVATAR IMPORT
@@ -262,7 +262,7 @@ 
                     $('#profile-user-email').val(data.email)
 
                     // reload page in case of language change
-                    if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language');?>') {
+                    if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language'); ?>') {
                         // prepare reload
                         $(this).delay(3000).queue(function() {
                             document.location.href = "index.php?page=profile";
@@ -273,7 +273,7 @@ 
                         // Inform user
                         toastr.remove();
                         toastr.info(
-                            '<?php echo $lang->get('alert_page_will_reload') . ' ... ' . $lang->get('please_wait'); ?>',
+                            '<?php echo $lang->get('alert_page_will_reload').' ... '.$lang->get('please_wait'); ?>',
                             '', {
                                 timeOut: 3000,
                                 progressBar: true
@@ -377,27 +377,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -490,27 +490,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -526,7 +526,7 @@ 
         }
     });
 
-    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
+    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
 
     $("#open-dialog-keys-download").on('click', function(event) {
         event.preventDefault();

pages/favourites.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
 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;
 }
 
@@ -118,12 +118,12 @@ 
                             if (empty($fav) === false) {
                                 $data = DB::queryFirstRow(
                                     'SELECT i.label, i.description, i.id, i.id_tree, t.title
-                                    FROM ' . prefixTable('items') . ' as i
-                                    INNER JOIN ' . prefixTable('nested_tree') . ' as t ON (t.id = i.id_tree)
+                                    FROM ' . prefixTable('items').' as i
+                                    INNER JOIN ' . prefixTable('nested_tree').' as t ON (t.id = i.id_tree)
                                     WHERE i.id = %i',
                                     $fav
                                 );
-                                if (! empty($data['label'])) {
+                                if (!empty($data['label'])) {
                                     ?>
                                     <tr>
                                         <td>

pages/folders.php

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('folders') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -99,28 +99,28 @@ 
 $complexityHtml = '<div id="hidden-select-complexity" class="hidden"><select id="select-complexity" class="form-control form-item-control save-me">';
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
-$complexityHtml .= $complexitySelect . '</select></div>';
+$complexityHtml .= $complexitySelect.'</select></div>';
 
 /* Get full tree structure */
 $tst = $tree->getDescendants();
 // prepare options list
-$droplist = '<option value="na">---' . $lang->get('select') . '---</option>';
+$droplist = '<option value="na">---'.$lang->get('select').'---</option>';
 if ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_create_root_folder') === 1) {
-    $droplist .= '<option value="0">' . $lang->get('root') . '</option>';
+    $droplist .= '<option value="0">'.$lang->get('root').'</option>';
 }
 foreach ($tst as $t) {
     if (
         in_array($t->id, $session->get('user-accessible_folders')) === true
         && in_array($t->id, $session->get('user-personal_visible_folders')) === false
     ) {
-        $droplist .= '<option value="' . $t->id . '">' . addslashes($t->title);
+        $droplist .= '<option value="'.$t->id.'">'.addslashes($t->title);
         $text = '';
         foreach ($tree->getPath($t->id, false) as $fld) {
-            $text .= empty($text) === true ? '     [' . $fld->title : ' > ' . $fld->title;
+            $text .= empty($text) === true ? '     ['.$fld->title : ' > '.$fld->title;
         }
-        $droplist .= (empty($text) === true ? '' : $text . '</i>]') . '</option>';
+        $droplist .= (empty($text) === true ? '' : $text.'</i>]').'</option>';
     }
 }
 
@@ -199,14 +199,14 @@ 
                                     <label><?php echo $lang->get('icon'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon" data-field="icon">
                                     <small class='form-text text-muted'>
-                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
                                     <label><?php echo $lang->get('icon_on_selection'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon-selected" data-field="iconSelected">
                                     <small class='form-text text-muted'>
-                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
@@ -297,7 +297,7 @@ 
                                 <th scope="col" min-width="200px"><?php echo $lang->get('group'); ?></th>
                                 <th scope="col" min-width="200px"><?php echo $lang->get('group_parent'); ?></th>
                                 <th scope="col" width="50px"><i class="fas fa-gavel fa-lg infotip" title="<?php echo $lang->get('password_strength'); ?>"></i></th>
-                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration') . ' ' . $lang->get('group_pw_duration_tip'); ?>"></i></th>
+                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration').' '.$lang->get('group_pw_duration_tip'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-pen fa-lg infotip" title="<?php echo $lang->get('auth_creation_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-edit fa-lg infotip" title="<?php echo $lang->get('auth_modification_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-folder fa-lg infotip" title="<?php echo $lang->get('icon'); ?>"></i></th>

pages/users.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === 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;
 }
 
@@ -85,24 +85,24 @@ 
 // If administrator then all roles are shown
 // else only the Roles the users is associated to.
 if ((int) $session->get('user-admin') === 1) {
-    $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>';
+    $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>';
 }
 
 $rows = DB::query(
     'SELECT id, title, creator_id
-    FROM ' . prefixTable('roles_title') . '
+    FROM ' . prefixTable('roles_title').'
     ORDER BY title ASC'
 );
 foreach ($rows as $record) {
     if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) {
-        $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>';
+        $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>';
     }
     if (
         (int) $session->get('user-admin') === 1
         || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1)
             && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id'))
     ) {
-        $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>';
+        $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>';
     }
 }
 
@@ -117,7 +117,7 @@ 
         for ($y = 1; $y < $t->nlevel; ++$y) {
             $ident .= '&nbsp;&nbsp;';
         }
-        $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>';
+        $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>';
     }
 }
 
@@ -154,7 +154,7 @@ 
                         </button><?php
                                     echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ?
                                         '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync">
-                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . '
+                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').'
                         </button>' : '';
                                     ?>
                     </h3>
@@ -226,7 +226,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>