nilsteampassnet / TeamPass

sources/main.functions.php

Indentation +1 added lines, -1 removed lines

@@ -2226,7 +2226,7 @@
  * <tt>exec("find ".$path." -type d -exec chmod 755 {} \;");</tt>
  *
  * @author Jeppe Toustrup (tenzer at tenzer dot dk)
-  *
+ *
  * @param string $path      An either relative or absolute path to a file or directory which should be processed.
  * @param int    $filePerm The permissions any found files should get.
  * @param int    $dirPerm  The permissions any found folder should get.

api/Model/AuthModel.php

Indentation +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
     {
         require API_ROOT_PATH . '/../includes/config/tp.config.php';
         $headers = ['alg'=>'HS256','typ'=>'JWT'];
-		$payload = [
+        $payload = [
             'username' => $login,
             'id' => $id, 
             'exp' => (time() + $SETTINGS['api_token_duration'] + 600),
@@ -105,7 +105,7 @@ 
         ];
 
         include_once API_ROOT_PATH . '/inc/jwt_utils.php';
-		return ['token' => generate_jwt($headers, $payload)];
+        return ['token' => generate_jwt($headers, $payload)];
     }
 
     //end createUserJWT

api/Model/FolderModel.php

Indentation +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
         $ret = [];
 
         foreach ($rows as $row) {
-			$isVisible = in_array((int) $row['id'], $foldersId);
+            $isVisible = in_array((int) $row['id'], $foldersId);
             $childrens = $this->getFoldersChildren($row['id'], $foldersId);
 
             if ($isVisible || count($childrens) > 0) {
@@ -43,7 +43,7 @@ 
                     [
                         'id' => (int) $row['id'],
                         'title' => $row['title'],
-						'isVisible' => $isVisible,
+                        'isVisible' => $isVisible,
                         'childrens' => $childrens
                     ]
                 );
@@ -63,7 +63,7 @@ 
 
         if ( count($childrens) > 0) {
             foreach ($childrens as $children) {
-				$isVisible = in_array((int) $children['id'], $foldersId);
+                $isVisible = in_array((int) $children['id'], $foldersId);
                 $childs = $this->getFoldersChildren($children['id'], $foldersId);
 
                 if (in_array((int) $children['id'], $foldersId) || count($childs) > 0) {
@@ -72,7 +72,7 @@ 
                         [
                             'id' => (int) $children['id'],
                             'title' => $children['title'],
-							'isVisible' => $isVisible,
+                            'isVisible' => $isVisible,
                             'childrens' => $childs
                         ]
                     );

pages/search.js.php

Indentation +22 added lines, -22 removed lines

@@ -2,28 +2,28 @@
 
 declare(strict_types=1);
 
- /**
-  * Teampass - a collaborative passwords manager.
-  * ---
-  * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  * ---
-  *
-  * @project   Teampass
-  *
-  * @file      search.js.php
-  * ---
-  *
-  * @author    Nils Laumaillé (nils@teampass.net)
-  *
-  * @copyright 2009-2023 Teampass.net
-  *
-  * @license   https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
-  * ---
-  *
-  * @see       https://www.teampass.net
-  */
+    /**
+     * Teampass - a collaborative passwords manager.
+     * ---
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     * ---
+     *
+     * @project   Teampass
+     *
+     * @file      search.js.php
+     * ---
+     *
+     * @author    Nils Laumaillé (nils@teampass.net)
+     *
+     * @copyright 2009-2023 Teampass.net
+     *
+     * @license   https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0
+     * ---
+     *
+     * @see       https://www.teampass.net
+     */
 
 Use TeampassClasses\PerformChecks\PerformChecks;
 

api/inc/jwt_utils.php

Indentation +44 added lines, -44 removed lines

@@ -26,43 +26,43 @@ 
 Use TeampassClasses\SuperGlobal\SuperGlobal;
 
 function generate_jwt($headers, $payload) {
-	$headers_encoded = base64url_encode(json_encode($headers));
+    $headers_encoded = base64url_encode(json_encode($headers));
 	
-	$payload_encoded = base64url_encode(json_encode($payload));
+    $payload_encoded = base64url_encode(json_encode($payload));
 	
-	$signature = hash_hmac('SHA256', "$headers_encoded.$payload_encoded", DB_PASSWD, true);
-	$signature_encoded = base64url_encode($signature);
+    $signature = hash_hmac('SHA256', "$headers_encoded.$payload_encoded", DB_PASSWD, true);
+    $signature_encoded = base64url_encode($signature);
 	
-	$jwt = "$headers_encoded.$payload_encoded.$signature_encoded";
+    $jwt = "$headers_encoded.$payload_encoded.$signature_encoded";
 	
-	return $jwt;
+    return $jwt;
 }
 
 function is_jwt_valid($jwt) {
-	// split the jwt
-	$tokenParts = explode('.', $jwt);
-	$header = base64_decode($tokenParts[0]);
-	$payload = base64_decode($tokenParts[1]);
-	$signature_provided = $tokenParts[2];
+    // split the jwt
+    $tokenParts = explode('.', $jwt);
+    $header = base64_decode($tokenParts[0]);
+    $payload = base64_decode($tokenParts[1]);
+    $signature_provided = $tokenParts[2];
 
-	// check the expiration time - note this will cause an error if there is no 'exp' claim in the jwt
-	$expiration = json_decode($payload)->exp;
-	$is_token_expired = ($expiration - time()) < 0;
+    // check the expiration time - note this will cause an error if there is no 'exp' claim in the jwt
+    $expiration = json_decode($payload)->exp;
+    $is_token_expired = ($expiration - time()) < 0;
 
-	// build a signature based on the header and payload using the secret
-	$base64_url_header = base64url_encode($header);
-	$base64_url_payload = base64url_encode($payload);
-	$signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
-	$base64_url_signature = base64url_encode($signature);
+    // build a signature based on the header and payload using the secret
+    $base64_url_header = base64url_encode($header);
+    $base64_url_payload = base64url_encode($payload);
+    $signature = hash_hmac('SHA256', $base64_url_header . "." . $base64_url_payload, DB_PASSWD, true);
+    $base64_url_signature = base64url_encode($signature);
 
-	// verify it matches the signature provided in the jwt
-	$is_signature_valid = ($base64_url_signature === $signature_provided);
+    // verify it matches the signature provided in the jwt
+    $is_signature_valid = ($base64_url_signature === $signature_provided);
 	
-	if ($is_token_expired || !$is_signature_valid) {
-		return FALSE;
-	} else {
-		return TRUE;
-	}
+    if ($is_token_expired || !$is_signature_valid) {
+        return FALSE;
+    } else {
+        return TRUE;
+    }
 }
 
 function base64url_encode($data) {
@@ -70,24 +70,24 @@ 
 }
 
 function get_authorization_header(){
-	$superGlobal = new SuperGlobal();
-	$headers = null;
+    $superGlobal = new SuperGlobal();
+    $headers = null;
 	
-	if (null !== $superGlobal->get('Authorization', 'SERVER')) {
-		$headers = trim($superGlobal->get('Authorization', 'SERVER'));
-	} else if (null !== $superGlobal->get('HTTP_AUTHORIZATION', 'SERVER')) { //Nginx or fast CGI
-		$headers = trim($superGlobal->get('HTTP_AUTHORIZATION', 'SERVER'));
-	} else if (function_exists('apache_request_headers') === true) {
-		$requestHeaders = (array) apache_request_headers();
-		// Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
-		$requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
-		//print_r($requestHeaders);
-		if (isset($requestHeaders['Authorization']) === true) {
-			$headers = trim($requestHeaders['Authorization']);
-		}
-	}
+    if (null !== $superGlobal->get('Authorization', 'SERVER')) {
+        $headers = trim($superGlobal->get('Authorization', 'SERVER'));
+    } else if (null !== $superGlobal->get('HTTP_AUTHORIZATION', 'SERVER')) { //Nginx or fast CGI
+        $headers = trim($superGlobal->get('HTTP_AUTHORIZATION', 'SERVER'));
+    } else if (function_exists('apache_request_headers') === true) {
+        $requestHeaders = (array) apache_request_headers();
+        // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
+        $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+        //print_r($requestHeaders);
+        if (isset($requestHeaders['Authorization']) === true) {
+            $headers = trim($requestHeaders['Authorization']);
+        }
+    }
 	
-	return $headers;
+    return $headers;
 }
 
 function get_bearer_token() {
@@ -104,8 +104,8 @@ 
 
 function get_bearer_data($jwt) {
     // split the jwt
-	$tokenParts = explode('.', $jwt);
-	$payload = base64_decode($tokenParts[1]);
+    $tokenParts = explode('.', $jwt);
+    $payload = base64_decode($tokenParts[1]);
 	
     // HEADER: Get the access token from the header
     if (empty($payload) === false) {