nilsteampassnet / TeamPass

pages/options.php

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('options') === false) {
     // Not allowed page
     $superGlobal->put('code', ERR_NOT_ALLOWED, 'SESSION', 'error');
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -297,7 +297,7 @@ 
                                     // get list of all timezones
                                     foreach ($zones as $key => $zone) {
                                         echo '
-                                <option value="' . $key . '"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>' . $zone . '</option>';
+                                <option value="' . $key.'"', isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : '', '>'.$zone.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -348,7 +348,7 @@ 
                                     <?php
                                     foreach ($languagesList as $teampassLang) {
                                         echo '
-                                <option value="' . $teampassLang . '"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>' . $teampassLang . '</option>';
+                                <option value="' . $teampassLang.'"', isset($SETTINGS['default_language']) === true && $SETTINGS['default_language'] === $teampassLang ? ' selected' : '', '>'.$teampassLang.'</option>';
                                     }
                                     ?>
                                 </select>
@@ -445,7 +445,7 @@ 
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $complex) {
                                     echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['personal_saltkey_security_level']) === true && $SETTINGS['personal_saltkey_security_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -781,7 +781,7 @@ 
                                         );
                                         foreach ($roles as $role) {
                                             echo '
-                                    <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>';
+                                    <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesToPrint) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>';
                                         }
                                     }
                                     ?>
@@ -958,7 +958,7 @@ 
                                     <?php
                                     foreach (TP_PW_COMPLEXITY as $complex) {
                                         echo '
-                                <option value="' . $complex[0] . '"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>' . $complex[1] . '</option>';
+                                <option value="' . $complex[0].'"', isset($SETTINGS['offline_key_level']) === true && $SETTINGS['offline_key_level'] === $complex[0] ? ' selected' : '', '>'.$complex[1].'</option>';
                                     }
                                     ?>
                                 </select>

scripts/task_maintenance_purge_old_files.php

Spacing +5 added lines, -5 removed lines

@@ -74,8 +74,8 @@ 
 function purgeTemporaryFiles(): void
 {
     // Load expected files
-    require_once __DIR__. '/../sources/main.functions.php';
-    require __DIR__. '/../includes/config/tp.config.php';
+    require_once __DIR__.'/../sources/main.functions.php';
+    require __DIR__.'/../includes/config/tp.config.php';
 
     if (isset($SETTINGS) === true) {
         //read folder
@@ -85,8 +85,8 @@ 
                 //delete file FILES
                 while (false !== ($f = readdir($dir))) {
                     if ($f !== '.' && $f !== '..' && $f !== '.htaccess') {
-                        if (file_exists($dir . $f) && ((time() - filectime($dir . $f)) > 604800)) {
-                            fileDelete($dir . '/' . $f, $SETTINGS);
+                        if (file_exists($dir.$f) && ((time() - filectime($dir.$f)) > 604800)) {
+                            fileDelete($dir.'/'.$f, $SETTINGS);
                         }
                     }
                 }
@@ -105,7 +105,7 @@ 
                 while (false !== ($f = readdir($dir))) {
                     if ($f !== '.' && $f !== '..') {
                         if (strpos($f, '_delete.') > 0) {
-                            fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS);
+                            fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS);
                         }
                     }
                 }

api/Model/AuthModel.php

Indentation +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
     {
         include API_ROOT_PATH . '/../includes/config/tp.config.php';
         
-		$payload = [
+        $payload = [
             'username' => $login,
             'id' => $id, 
             'exp' => (time() + $SETTINGS['api_token_duration'] + 600),

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'