nilsteampassnet / TeamPass

api/Model/Database.php

Spacing +12 added lines, -12 removed lines

@@ -31,7 +31,7 @@ 
         try {
             $this->connection = new \mysqli(DB_HOST, DB_USER, DB_PASSWD_CLEAR, DB_NAME);
 
-            if ( mysqli_connect_errno()) {
+            if (mysqli_connect_errno()) {
                 throw new Exception("Could not connect to database.");   
             }
         } catch (Exception $e) {
@@ -39,37 +39,37 @@ 
         }           
     }
 
-    public function select($query = "" , $params = [])
+    public function select($query = "", $params = [])
     {
         try {
-            $stmt = $this->executeStatement( $query , $params );
+            $stmt = $this->executeStatement($query, $params);
             $result = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);               
             $stmt->close();
 
             return $result;
-        } catch(Exception $e) {
-            throw New Exception( $e->getMessage() );
+        } catch (Exception $e) {
+            throw New Exception($e->getMessage());
         }
     }
 
-    private function executeStatement($query = "" , $params = [])
+    private function executeStatement($query = "", $params = [])
     {
         try {
-            $stmt = $this->connection->prepare( $query );
+            $stmt = $this->connection->prepare($query);
 
-            if($stmt === false) {
-                throw New Exception("Unable to do prepared statement: " . $query);
+            if ($stmt === false) {
+                throw New Exception("Unable to do prepared statement: ".$query);
             }
 
-            if( $params ) {
+            if ($params) {
                 $stmt->bind_param($params[0], $params[1]);
             }
 
             $stmt->execute();
 
             return $stmt;
-        } catch(Exception $e) {
-            throw New Exception( $e->getMessage() );
+        } catch (Exception $e) {
+            throw New Exception($e->getMessage());
         }   
     }
 }
\ No newline at end of file

api/inc/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -26,22 +26,22 @@ 
 
 use TeampassClasses\SuperGlobal\SuperGlobal;
 
-define("API_ROOT_PATH", __DIR__ . "/..");
+define("API_ROOT_PATH", __DIR__."/..");
 
 // include main configuration file
-require API_ROOT_PATH . '/../sources/main.functions.php';
+require API_ROOT_PATH.'/../sources/main.functions.php';
 
 // init
 loadClasses('DB');
 $superGlobal = new SuperGlobal();
 
 // include the base controller file
-require API_ROOT_PATH . "/Controller/Api/BaseController.php";
+require API_ROOT_PATH."/Controller/Api/BaseController.php";
 
 // include the use model file
-require API_ROOT_PATH . "/Model/UserModel.php";
-require API_ROOT_PATH . "/Model/ItemModel.php";
-require API_ROOT_PATH . "/Model/FolderModel.php";
+require API_ROOT_PATH."/Model/UserModel.php";
+require API_ROOT_PATH."/Model/ItemModel.php";
+require API_ROOT_PATH."/Model/FolderModel.php";
 
 /**
  * Launch expected action for ITEM
@@ -52,10 +52,10 @@ 
  */
 function itemAction(array $actions, array $userData)
 {
-    require API_ROOT_PATH . "/Controller/Api/ItemController.php";
+    require API_ROOT_PATH."/Controller/Api/ItemController.php";
     
     $objFeedController = new ItemController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -68,10 +68,10 @@ 
  */
 function folderAction(array $actions, array $userData)
 {
-    require API_ROOT_PATH . "/Controller/Api/FolderController.php";
+    require API_ROOT_PATH."/Controller/Api/FolderController.php";
 
     $objFeedController = new FolderController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -82,7 +82,7 @@ 
  */
 function apiIsEnabled(): string
 {
-    include API_ROOT_PATH . '/../includes/config/tp.config.php';
+    include API_ROOT_PATH.'/../includes/config/tp.config.php';
 
     if (isset($SETTINGS) === true && isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
         return json_encode(
@@ -111,7 +111,7 @@ 
  */
 function verifyAuth(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false && is_jwt_valid($bearer_token) === true) {
@@ -141,7 +141,7 @@ 
  */
 function getDataFromToken(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false) {

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/utilities.logs.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === 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;
 }
 
@@ -202,7 +202,7 @@ 
                                             echo null !== $session->get('user-admin') && (int) $session->get('user-admin') === 1 ? '' : ' hidden';
                                             ?>">
                         <div class="form-group">
-                            <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge') . ' ' . $lang->get('date_range'); ?></h5>
+                            <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge').' '.$lang->get('date_range'); ?></h5>
                             <div class="input-group">
                                 <div class="input-group-prepend">
                                     <span class="input-group-text">
@@ -225,7 +225,7 @@ 
                                     <select class="form-control" id="purge-filter-user">
                                         <option value="-1"><?php echo $lang->get('all'); ?></option>
                                     <?php
-                                    $rows = DB::query('SELECT id, name, lastname FROM ' . prefixTable('users') . ' WHERE admin = 0');
+                                    $rows = DB::query('SELECT id, name, lastname FROM '.prefixTable('users').' WHERE admin = 0');
 foreach ($rows as $record) {
     echo '
                                         <option value="'.$record['id'].'">'.$record['name'].' '.$record['lastname'].'</option>';