nilsteampassnet / TeamPass

scripts/background_tasks___worker.php

Braces +18 added lines, -6 removed lines

@@ -64,7 +64,9 @@ 
      */
     public function execute() {
         try {
-            if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            if (LOG_TASKS=== true) {
+                $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            }
             // Dispatch selon le type de processus
             switch ($this->processType) {
                 case 'item_copy':
@@ -136,7 +138,9 @@ 
             $arguments = '';
         }
 
-        if (LOG_TASKS=== true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        }
 
         // Add 'arguments' only if not empty
         if (!empty($arguments)) {
@@ -150,7 +154,9 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        }
     }
 
     /**
@@ -185,7 +191,9 @@ 
      * @return void
      */
     private function processSubTasks($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        }
         // Get all subtasks related to this task
         $subtasks = DB::query(
             'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
@@ -194,7 +202,9 @@ 
     
         // Check if there are any subtasks to process
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            if (LOG_TASKS=== true) {
+                $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            }
             return;
         }
     
@@ -204,7 +214,9 @@ 
                 // Get the subtask data
                 $subtaskData = json_decode($subtask['task'], true);
 
-                if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                if (LOG_TASKS=== true) {
+                    $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                }
 
                 // Mark subtask as in progress
                 DB::update(

Spacing +12 added lines, -12 removed lines

@@ -33,7 +33,7 @@ 
 require_once __DIR__.'/traits/UserHandlerTrait.php';
 require_once __DIR__.'/traits/EmailTrait.php';
 require_once __DIR__.'/traits/MigrateUserHandlerTrait.php';
-require_once __DIR__ . '/taskLogger.php';
+require_once __DIR__.'/taskLogger.php';
 
 class TaskWorker {
     use ItemHandlerTrait;
@@ -66,7 +66,7 @@ 
      */
     public function execute() {
         try {
-            if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('Processing task: '.print_r($this->taskData, true), 'DEBUG');
             // Dispatch selon le type de processus
             switch ($this->processType) {
                 case 'item_copy':
@@ -141,7 +141,7 @@ 
             $arguments = '';
         }
 
-        if (LOG_TASKS=== true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG');
 
         // Add 'arguments' only if not empty
         if (!empty($arguments)) {
@@ -155,7 +155,7 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Finishing task: '.$this->taskId, 'DEBUG');
     }
 
     /**
@@ -178,7 +178,7 @@ 
             'increment_id = %i',
             $this->taskId
         );
-        $this->logger->log('Task failure: ' . $e->getMessage(), 'ERROR');
+        $this->logger->log('Task failure: '.$e->getMessage(), 'ERROR');
     }
 
     /**
@@ -190,16 +190,16 @@ 
      * @return void
      */
     private function processSubTasks($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('processSubTasks: '.print_r($arguments, true), 'DEBUG');
         // Get all subtasks related to this task
         $subtasks = DB::query(
-            'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
+            'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
             $this->taskId
         );
     
         // Check if there are any subtasks to process
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG');
+            if (LOG_TASKS === true) $this->logger->log('No subtask was found for task: '.$this->taskId, 'DEBUG');
             return;
         }
     
@@ -209,7 +209,7 @@ 
                 // Get the subtask data
                 $subtaskData = json_decode($subtask['task'], true);
 
-                if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG');
+                if (LOG_TASKS === true) $this->logger->log('Processing subtask: '.$subtaskData['step'], 'DEBUG');
 
                 // Mark subtask as in progress
                 DB::update(
@@ -261,13 +261,13 @@ 
                     $subtask['increment_id']
                 );
         
-                $this->logger->log('processSubTasks : ' . $e->getMessage(), 'ERROR');
+                $this->logger->log('processSubTasks : '.$e->getMessage(), 'ERROR');
             }
         }
     
         // Are all subtasks completed?
         $remainingSubtasks = DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0',
+            'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0',
             $this->taskId
         );
     
@@ -283,7 +283,7 @@ 
     error_log("Usage: php background_tasks___worker.php <task_id> <process_type> [<task_data>]");
     exit(1);
 }
-$taskId = (int)$argv[1];
+$taskId = (int) $argv[1];
 $processType = $argv[2];
 $taskData = $argv[3] ?? null;
 if ($taskData) {

sources/export.queries.php

Spacing +64 added lines, -64 removed lines

@@ -78,7 +78,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -100,7 +100,7 @@ 
 $antiXss = new AntiXSS();
 
 // User's language loading
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 
 // Prepare POST variables
 $id = filter_input(INPUT_POST, 'id', FILTER_SANITIZE_NUMBER_INT);
@@ -151,9 +151,9 @@ 
                         'SELECT i.id as id, i.id_tree as id_tree, i.restricted_to as restricted_to, i.perso as perso,
                             i.label as label, i.description as description, i.pw as pw, i.login as login, i.url as url,
                             i.email as email,l.date as date, i.pw_iv as pw_iv,n.renewal_period as renewal_period
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -176,8 +176,8 @@ 
                                 // Run query
                                 $dataItem = DB::queryFirstRow(
                                     'SELECT i.pw AS pw, s.share_key AS share_key
-                                    FROM ' . prefixTable('items') . ' AS i
-                                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                    FROM ' . prefixTable('items').' AS i
+                                    INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                     WHERE user_id = %i AND i.id = %i',
                                     $session->get('user-id'),
                                     $record['id']
@@ -201,8 +201,8 @@ 
                                 $arr_kbs = [];
                                 $rows_kb = DB::query(
                                     'SELECT b.label, b.id
-                                    FROM ' . prefixTable('kb_items') . ' AS a
-                                    INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                    FROM ' . prefixTable('kb_items').' AS a
+                                    INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                     WHERE a.item_id = %i',
                                     $record['id']
                                 );
@@ -214,7 +214,7 @@ 
                                 $arr_tags = [];
                                 $rows_tag = DB::query(
                                     'SELECT tag
-                                    FROM ' . prefixTable('tags') . '
+                                    FROM ' . prefixTable('tags').'
                                     WHERE item_id = %i',
                                     $record['id']
                                 );
@@ -226,18 +226,18 @@ 
                                 $arr_trees = [];
                                 $rows_child_tree = DB::query(
                                     'SELECT t.id, t.title
-                                    FROM ' . prefixTable('nested_tree') . ' AS t
-                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (t.id = i.id_tree)
+                                    FROM ' . prefixTable('nested_tree').' AS t
+                                    INNER JOIN ' . prefixTable('items').' AS i ON (t.id = i.id_tree)
                                     WHERE i.id = %i',
                                     $record['id']
                                 );
                                 foreach ($rows_child_tree as $rec_child_tree) {
                                     $stack = array();
                                     $parent = $rec_child_tree['id'];
-                                    while($parent != 0){
+                                    while ($parent != 0) {
                                         $rows_parent_tree = DB::query(
                                             'SELECT parent_id, title
-                                            FROM ' . prefixTable('nested_tree') . '
+                                            FROM ' . prefixTable('nested_tree').'
                                             WHERE id = %i',
                                             $parent
                                         );
@@ -324,7 +324,7 @@ 
             // Prepare variables
             $post_export_tag = filter_var($dataReceived['export_tag'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             if (empty($post_export_tag) === false) {
-                DB::query('DELETE FROM ' . prefixTable('export') . ' WHERE export_tag = %s', $post_export_tag);
+                DB::query('DELETE FROM '.prefixTable('export').' WHERE export_tag = %s', $post_export_tag);
             }
             break;
 
@@ -374,9 +374,9 @@ 
                         l.date as date, i.pw_iv as pw_iv,
                         n.renewal_period as renewal_period,
                         i.id_tree as tree_id
-                        FROM ' . prefixTable('items') . ' as i
-                        INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
-                        INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id = l.id_item)
+                        FROM ' . prefixTable('items').' as i
+                        INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
+                        INNER JOIN ' . prefixTable('log_items').' as l ON (i.id = l.id_item)
                         WHERE i.inactif = %i
                         AND i.id_tree= %i
                         AND (l.action = %s OR (l.action = %s AND l.raison LIKE %s))
@@ -402,8 +402,8 @@ 
                             // Run query
                             $dataItem = DB::queryFirstRow(
                                 'SELECT i.pw AS pw, s.share_key AS share_key
-                                FROM ' . prefixTable('items') . ' AS i
-                                INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+                                FROM ' . prefixTable('items').' AS i
+                                INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
                                 WHERE user_id = %i AND i.id = %i',
                                 $session->get('user-id'),
                                 $record['id']
@@ -427,8 +427,8 @@ 
                             $arr_kbs = '';
                             $rows_kb = DB::query(
                                 'SELECT b.label, b.id
-                                FROM ' . prefixTable('kb_items') . ' AS a
-                                INNER JOIN ' . prefixTable('kb') . ' AS b ON (a.kb_id = b.id)
+                                FROM ' . prefixTable('kb_items').' AS a
+                                INNER JOIN ' . prefixTable('kb').' AS b ON (a.kb_id = b.id)
                                 WHERE a.item_id = %i',
                                 $record['id']
                             );
@@ -436,7 +436,7 @@ 
                                 if (empty($arr_kbs)) {
                                     $arr_kbs = $rec_kb['label'];
                                 } else {
-                                    $arr_kbs .= ' | ' . $rec_kb['label'];
+                                    $arr_kbs .= ' | '.$rec_kb['label'];
                                 }
                             }
 
@@ -444,7 +444,7 @@ 
                             $arr_tags = '';
                             $rows_tag = DB::query(
                                 'SELECT tag
-                                FROM ' . prefixTable('tags') . '
+                                FROM ' . prefixTable('tags').'
                                 WHERE item_id = %i',
                                 $record['id']
                             );
@@ -452,7 +452,7 @@ 
                                 if (empty($arr_tags)) {
                                     $arr_tags = $rec_tag['tag'];
                                 } else {
-                                    $arr_tags .= ' ' . $rec_tag['tag'];
+                                    $arr_tags .= ' '.$rec_tag['tag'];
                                 }
                             }
 
@@ -530,7 +530,7 @@ 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s',
                 $dataReceived['export_tag']
             );
@@ -542,7 +542,7 @@ 
                 $prev_path = '';
 
                 //Prepare the PDF file
-                require_once $SETTINGS['cpassman_dir'] . '/vendor/tecnickcom/tcpdf/tcpdf.php';
+                require_once $SETTINGS['cpassman_dir'].'/vendor/tecnickcom/tcpdf/tcpdf.php';
 
                 $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
                 $pdf->SetProtection(array('print'), $dataReceived['pdf_password'], null);
@@ -554,7 +554,7 @@ 
 
                 // set default header data
                 $pdf->SetHeaderData(
-                    $SETTINGS['cpassman_dir'] . '/includes/images/teampass-logo2-home.png',
+                    $SETTINGS['cpassman_dir'].'/includes/images/teampass-logo2-home.png',
                     PDF_HEADER_LOGO_WIDTH,
                     'Teampass export',
                     $session->get('user-lastname')." ".$session->get('user-name').' @ '.date($SETTINGS['date_format']." ".$SETTINGS['time_format'], (int) time())
@@ -664,7 +664,7 @@ 
                 logEvents($SETTINGS, 'pdf_export', '', (string) $session->get('user-id'), $session->get('user-login'));
 
                 //clean table
-                DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+                DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
                 // Clean any content of the output buffer
                 ob_end_clean();
@@ -702,13 +702,13 @@ 
             // step 1:
             // - prepare export file
             // - get full list of objects id to export
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
             $idsList = array();
 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s',
                 $inputData['export_tag']
             );
@@ -745,13 +745,13 @@ 
             }
             // prepare export file
             //save the file
-            $outstream = fopen($SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'], 'w');
+            $outstream = fopen($SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'], 'w');
             if ($outstream === false) {
                 echo (string) prepareExchangedData(
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -777,12 +777,12 @@ 
     </style>
     </head>
     <body>
-    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['password']) . '" />
+    <input type="hidden" id="generation_date" value="' . GibberishAES::enc(/** @scrutinizer ignore-type */ (string) time(), $inputData['password']).'" />
     <div id="header">
-    ' . TP_TOOL_NAME . ' - Off Line mode
+    ' . TP_TOOL_NAME.' - Off Line mode
     </div>
     <div style="margin:10px; font-size:9px;">
-    <i>This page was generated by <b>' . $session->get('user-name') . ' ' . $session->get('user-lastname') . '</b>, the ' . date('Y/m/d H:i:s') . '.</i>
+    <i>This page was generated by <b>' . $session->get('user-name').' '.$session->get('user-lastname').'</b>, the '.date('Y/m/d H:i:s').'.</i>
     <span id="info_page" style="margin-left:20px; font-weight:bold; font-size: 14px; color:red;"></span>
     </div>
     <div id="information"></div>
@@ -793,11 +793,11 @@ 
     <div>
     <table id="itemsTable">
         <thead><tr>
-            <th style="width:15%;">' . $lang->get('label') . '</th>
-            <th style="width:10%;">' . $lang->get('pw') . '</th>
-            <th style="width:30%;">' . $lang->get('description') . '</th>
-            <th style="width:5%;">' . $lang->get('user_login') . '</th>
-            <th style="width:20%;">' . $lang->get('url') . '</th>
+            <th style="width:15%;">' . $lang->get('label').'</th>
+            <th style="width:10%;">' . $lang->get('pw').'</th>
+            <th style="width:30%;">' . $lang->get('description').'</th>
+            <th style="width:5%;">' . $lang->get('user_login').'</th>
+            <th style="width:20%;">' . $lang->get('url').'</th>
         </tr></thead>
         <tbody id="itemsTable_tbody">'
             );
@@ -811,8 +811,8 @@ 
                     'loop' => true,
                     'ids_list' => json_encode($idsList),
                     'ids_count' => count($idsList),
-                    'file_path' => $SETTINGS['path_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'],
-                    'file_link' => $SETTINGS['url_to_files_folder'] . (substr($SETTINGS['path_to_files_folder'] , -1) === '/' ? '' : '/') . $inputData['filename'],
+                    'file_path' => $SETTINGS['path_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'],
+                    'file_link' => $SETTINGS['url_to_files_folder'].(substr($SETTINGS['path_to_files_folder'], -1) === '/' ? '' : '/').$inputData['filename'],
                     'export_tag' => $inputData['export_tag'],
                 ],
                 'encode'
@@ -851,12 +851,12 @@ 
             $full_listing = array();
             $items_id_list = array();
             $outstream = '';
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
             // query
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('export') . ' 
+                FROM ' . prefixTable('export').' 
                 WHERE export_tag = %s AND item_id IN %ls',
                 $inputData['export_tag'],
                 $inputData['idsList']
@@ -870,7 +870,7 @@ 
                         [
                             'error' => true,
                             'message' => $lang->get('error_while_creating_file'),
-                            'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                            'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                         ],
                         'encode'
                     );
@@ -903,13 +903,13 @@ 
                         if (empty($arboHtml)) {
                             $arboHtml = $arboHtml_tmp;
                         } else {
-                            $arboHtml .= ' » ' . $arboHtml_tmp;
+                            $arboHtml .= ' » '.$arboHtml_tmp;
                         }
                     }
                     fputs(
                         $outstream,
                         '
-        <tr class="path"><td colspan="5">' . $arboHtml . '</td></tr>'
+        <tr class="path"><td colspan="5">' . $arboHtml.'</td></tr>'
                     );
                     $idTree = $record['folder_id'];
 
@@ -917,12 +917,12 @@ 
                     fputs(
                         $outstream,
                         '
-        <tr class="' . $lineType . '">
-            <td>' . addslashes($record['label']) . '</td>
-            <td align="center"><span class="span_pw" id="span_' . $record['item_id'] . '"><a href="#" onclick="decryptme(' . $record['item_id'] . ', \'' . $encPw . '\');return false;">Decrypt </a></span><input type="hidden" id="hide_' . $record['item_id'] . '" value="' . $encPw . '" /></td>
-            <td>' . (empty($record['description']) === true ? '&nbsp;' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))) . '</td>
-            <td align="center">' . (empty($record['login']) === true ? '&nbsp;' : addslashes($record['login'])) . '</td>
-            <td align="center">' . (empty($record['url']) === true ? '&nbsp;' : addslashes($record['url'])) . '</td>
+        <tr class="' . $lineType.'">
+            <td>' . addslashes($record['label']).'</td>
+            <td align="center"><span class="span_pw" id="span_' . $record['item_id'].'"><a href="#" onclick="decryptme('.$record['item_id'].', \''.$encPw.'\');return false;">Decrypt </a></span><input type="hidden" id="hide_'.$record['item_id'].'" value="'.$encPw.'" /></td>
+            <td>' . (empty($record['description']) === true ? '&nbsp;' : addslashes(str_replace(array(';', '<br />'), array('|', "\n\r"), stripslashes(mb_convert_encoding($record['description'], 'ISO-8859-1', 'UTF-8'))))).'</td>
+            <td align="center">' . (empty($record['login']) === true ? '&nbsp;' : addslashes($record['login'])).'</td>
+            <td align="center">' . (empty($record['url']) === true ? '&nbsp;' : addslashes($record['url'])).'</td>
         </tr>'
                     );
                 }
@@ -971,7 +971,7 @@ 
             $inputData['password'] = (string) filter_var($dataReceived['password'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             
             // Load includes
-            include $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
+            include $SETTINGS['cpassman_dir'].'/includes/config/include.php';
 
             // read the content of the temporary file
             $handle = fopen($inputData['filename'].'.txt', 'r');
@@ -980,7 +980,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -992,7 +992,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -1008,9 +1008,9 @@ 
             $chunks = explode('|#|#|', chunk_split($contents, 10000, '|#|#|'));
             foreach ($chunks as $chunk) {
                 if (empty($encrypted_text) === true) {
-                    $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] );
+                    $encrypted_text = GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']);
                 } else {
-                    $encrypted_text .= '|#|#|' . GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password'] );
+                    $encrypted_text .= '|#|#|'.GibberishAES::enc(/** @scrutinizer ignore-type */ $chunk, $inputData['password']);
                 }
             }
 
@@ -1021,7 +1021,7 @@ 
                     [
                         'error' => true,
                         'message' => $lang->get('error_while_creating_file'),
-                        'detail' => $SETTINGS['path_to_files_folder'] . $inputData['filename'],
+                        'detail' => $SETTINGS['path_to_files_folder'].$inputData['filename'],
                     ],
                     'encode'
                 );
@@ -1034,9 +1034,9 @@ 
         </table></div>
         <input type="button" value="Hide all" onclick="hideAll()" />
         <div id="footer" style="text-align:center;">
-            <a href="https://teampass.net/about/" target="_blank">' . TP_TOOL_NAME . '&nbsp;' . TP_VERSION . '&nbsp;' . TP_COPYRIGHT . '</a>
+            <a href="https://teampass.net/about/" target="_blank">' . TP_TOOL_NAME.'&nbsp;'.TP_VERSION.'&nbsp;'.TP_COPYRIGHT.'</a>
         </div>
-        <div id="enc_html" style="display:none;">' . $encrypted_text . '</div>
+        <div id="enc_html" style="display:none;">' . $encrypted_text.'</div>
         </body>
     </html>
     <script type="text/javascript">
@@ -1139,12 +1139,12 @@ 
             fclose($outstream);
 
             //clean table
-            DB::query('TRUNCATE TABLE ' . prefixTable('export'));
+            DB::query('TRUNCATE TABLE '.prefixTable('export'));
 
             echo (string) prepareExchangedData(
                 [
                     'error' => false,
-                    'filelink' => $inputData['file_link'] ,
+                    'filelink' => $inputData['file_link'],
                 ],
                 'encode'
             );

sources/downloadFile.php

Spacing +12 added lines, -12 removed lines

@@ -76,7 +76,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -134,13 +134,13 @@ 
     
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
-    header('Content-Disposition: attachment; filename="' . $safeFilename . '"');
+    header('Content-Disposition: attachment; filename="'.$safeFilename.'"');
     header('Cache-Control: must-revalidate, no-cache, no-store');
     header('Pragma: public');
     header('Expires: 0');
     
     if ($filesize !== null) {
-        header('Content-Length: ' . $filesize);
+        header('Content-Length: '.$filesize);
     }
 }
 
@@ -152,7 +152,7 @@ 
         return false;
     }
     
-    $filepath = $basePath . '/' . basename($filename);
+    $filepath = $basePath.'/'.basename($filename);
     
     // Security: Verify the resolved path is within the allowed directory
     $realBasePath = realpath($basePath);
@@ -230,8 +230,8 @@ 
     $file_info = DB::queryFirstRow(
         'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
         s.share_key AS share_key
-        FROM ' . prefixTable('files') . ' AS f
-        INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+        FROM ' . prefixTable('files').' AS f
+        INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
         WHERE s.user_id = %i AND s.object_id = %i',
         $session->get('user-id'),
         $get_fileid
@@ -251,7 +251,7 @@ 
         // Get unencrypted file info
         $file_info = DB::queryFirstRow(
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension
-            FROM ' . prefixTable('files') . ' AS f
+            FROM ' . prefixTable('files').' AS f
             WHERE f.id = %i',
             $get_fileid
         );
@@ -263,13 +263,13 @@ 
     
     // Prepare filename for download
     $filename = str_replace('b64:', '', $file_info['name']);
-    $filename = basename($filename, '.' . $file_info['extension']);
+    $filename = basename($filename, '.'.$file_info['extension']);
     $filename = isBase64($filename) === true ? base64_decode($filename) : $filename;
-    $filename = $filename . '.' . $file_info['extension'];
+    $filename = $filename.'.'.$file_info['extension'];
     
     // Determine file path
-    $candidatePath1 = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . $file_info['file'];
-    $candidatePath2 = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file_info['file']);
+    $candidatePath1 = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file'];
+    $candidatePath2 = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file_info['file']);
     
     $filePath = false;
     if (file_exists($candidatePath1)) {
@@ -279,7 +279,7 @@ 
     }
     
     if (WIP === true) {
-        error_log('downloadFile.php: filePath: ' . $filePath . " - ");
+        error_log('downloadFile.php: filePath: '.$filePath." - ");
     }
     
     // Validate file path and security

sources/backups.queries.php

Spacing +26 added lines, -26 removed lines

@@ -77,7 +77,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -138,14 +138,14 @@ 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         
             // get a token
             $token = GenerateCryptKey(20, false, true, true, false, true);
         
             //save file
-            $filename = time() . '-' . $token . '.sql';
-            $filepath = $SETTINGS['path_to_files_folder'] . '/' . $filename;
+            $filename = time().'-'.$token.'.sql';
+            $filepath = $SETTINGS['path_to_files_folder'].'/'.$filename;
             $handle = fopen($filepath, 'w+');
             
             if ($handle === false) {
@@ -163,7 +163,7 @@ 
             $tables = array();
             $result = DB::query('SHOW TABLES');
             foreach ($result as $row) {
-                $tables[] = $row['Tables_in_' . DB_NAME];
+                $tables[] = $row['Tables_in_'.DB_NAME];
             }
         
             $backupSuccess = true;
@@ -173,9 +173,9 @@ 
                 if (empty($pre) || substr_count($table, $pre) > 0) {
                     $table = safeString($table);
                     // Write table drop and creation
-                    fwrite($handle, 'DROP TABLE IF EXISTS ' . $table . ";\n");
-                    $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table);
-                    fwrite($handle, safeString($row2['Create Table']) . ";\n\n");
+                    fwrite($handle, 'DROP TABLE IF EXISTS '.$table.";\n");
+                    $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table);
+                    fwrite($handle, safeString($row2['Create Table']).";\n\n");
         
                     // Get field information
                     DB::query(
@@ -200,7 +200,7 @@ 
                         }
                         
                         foreach ($rows as $record) {
-                            $insertQuery = 'INSERT INTO ' . $table . ' VALUES(';
+                            $insertQuery = 'INSERT INTO '.$table.' VALUES(';
                             $values = array();
                             
                             foreach ($record as $value) {
@@ -208,11 +208,11 @@ 
                                 if ($value === null) {
                                     $values[] = 'NULL';
                                 } else {
-                                    $values[] = '"' . addslashes(preg_replace("/\n/", '\\n', $value)) . '"';
+                                    $values[] = '"'.addslashes(preg_replace("/\n/", '\\n', $value)).'"';
                                 }
                             }
                             
-                            $insertQuery .= implode(',', $values) . ");\n";
+                            $insertQuery .= implode(',', $values).");\n";
                             fwrite($handle, $insertQuery);
                             
                             // Flush buffer periodically to free memory
@@ -242,14 +242,14 @@ 
                 prepareFileWithDefuse(
                     'encrypt',
                     $filepath,
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                     $post_key
                 );
         
                 // Do clean
                 unlink($filepath);
                 rename(
-                    $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                    $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                     $filepath
                 );
             }
@@ -271,9 +271,9 @@ 
                 array(
                     'error' => false,
                     'message' => '',
-                    'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                        '&action=backup&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' .
-                        $session->get('user-key_tmp') . '&pathIsFiles=1',
+                    'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                        '&action=backup&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.
+                        $session->get('user-key_tmp').'&pathIsFiles=1',
                 ),
                 'encode'
             );
@@ -334,13 +334,13 @@ 
                 error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
             }
         
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         
             if (empty($post_clearFilename) === true) {
                 // Get filename from database
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE increment_id = %i',
                     $post_backupFile
                 );
@@ -367,7 +367,7 @@ 
                 $post_backupFile = safeString($data['valeur']);
                 
                 // Verify file exists
-                if (!file_exists($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile)) {
+                if (!file_exists($SETTINGS['path_to_files_folder'].'/'.$post_backupFile)) {
                     echo prepareExchangedData(
                         array(
                             'error' => true,
@@ -384,8 +384,8 @@ 
                     // Decrypt the file
                     $ret = prepareFileWithDefuse(
                         'decrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
                         $post_key
                     );
                     
@@ -402,8 +402,8 @@ 
                     }
         
                     // Do clean
-                    fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
-                    $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
+                    fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
+                    $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
                 } else {
                     echo prepareExchangedData(
                         array(
@@ -487,7 +487,7 @@ 
                                 DB::query($query);
                                 $executedQueries++;
                             } catch (Exception $e) {
-                                $errors[] = "Error executing query: " . $e->getMessage() . " - Query: " . substr($query, 0, 100) . "...";
+                                $errors[] = "Error executing query: ".$e->getMessage()." - Query: ".substr($query, 0, 100)."...";
                             }
                             $query = '';
                         }
@@ -513,7 +513,7 @@ 
                 }
                 // Rollback transaction on any exception
                 DB::rollback();
-                $errors[] = "Transaction failed: " . $e->getMessage();
+                $errors[] = "Transaction failed: ".$e->getMessage();
             }
         
             // Calculate the new offset
@@ -528,7 +528,7 @@ 
                 echo prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'Errors occurred during import: ' . implode('; ', $errors),
+                        'message' => 'Errors occurred during import: '.implode('; ', $errors),
                         'newOffset' => $newOffset,
                         'totalSize' => $post_totalSize,
                         'clearFilename' => $post_backupFile,

api/Controller/Api/ItemController.php

Spacing +6 added lines, -6 removed lines

@@ -40,11 +40,11 @@ 
      */
     private function getUserPrivateKey(array $userData): ?string
     {
-        include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+        include_once API_ROOT_PATH.'/inc/jwt_utils.php';
 
         // Verify session_key exists in JWT payload
         if (!isset($userData['session_key']) || empty($userData['session_key'])) {
-            error_log('getUserPrivateKey: Missing session_key in JWT token for user ID ' . $userData['id']);
+            error_log('getUserPrivateKey: Missing session_key in JWT token for user ID '.$userData['id']);
             return null;
         }
 
@@ -88,7 +88,7 @@ 
             // SQL where clause with folders list
             if (isset($arrQueryStringParams['folders']) === true) {
                 // convert the folders to an array
-                $arrQueryStringParams['folders'] = explode(',', str_replace( array('[',']') , ''  , $arrQueryStringParams['folders']));
+                $arrQueryStringParams['folders'] = explode(',', str_replace(array('[', ']'), '', $arrQueryStringParams['folders']));
 
                 // ensure to only use the intersection
                 $foldersList = implode(',', array_intersect($arrQueryStringParams['folders'], $userData['folders_list']));
@@ -256,7 +256,7 @@ 
                 } else {
                     // Gérer le cas où les paramètres ne sont pas un tableau
                     $strErrorDesc = 'Data not consistent';
-                    $strErrorHeader = 'Expected array, received ' . gettype($arrQueryStringParams);
+                    $strErrorHeader = 'Expected array, received '.gettype($arrQueryStringParams);
                 }
             }
         } else {
@@ -307,10 +307,10 @@ 
             // SQL where clause with item id
             if (isset($arrQueryStringParams['id']) === true) {
                 // build sql where clause by ID
-                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'] . $sql_constraint;
+                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'].$sql_constraint;
             } else if (isset($arrQueryStringParams['label']) === true) {
                 // build sql where clause by LABEL
-                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']) . $sql_constraint;
+                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']).$sql_constraint;
             } else if (isset($arrQueryStringParams['description']) === true) {
                 // build sql where clause by LABEL
                 $sqlExtra = ' WHERE i.description '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['description'] : ' = '.$arrQueryStringParams['description']).$sql_constraint;

api/Model/AuthModel.php

Indentation +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
         $configManager = new ConfigManager();
         $SETTINGS = $configManager->getAllSettings();
 
-		$payload = [
+        $payload = [
             'username' => $login,
             'id' => $id,
             'exp' => (time() + $SETTINGS['api_token_duration'] + 600),

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,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 : '',
@@ -74,8 +74,8 @@ 
             // Check if user exists
             $userInfo = DB::queryfirstrow(
                 "SELECT u.id, u.pw, u.login, u.admin, u.gestionnaire, u.can_manage_all_users, u.fonction_id, u.can_create_root_folder, u.public_key, u.private_key, u.personal_folder, u.fonction_id, u.groupes_visibles, u.groupes_interdits, a.value AS user_api_key, a.allowed_folders as user_api_allowed_folders, a.enabled, a.allowed_to_create, a.allowed_to_read, a.allowed_to_update, a.allowed_to_delete
-                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 = %s",
                 $inputData['login']
             );
@@ -118,7 +118,7 @@ 
 
                 // Encrypt the decrypted private key with the session key
                 // This allows us to store it securely in the database without exposing it
-                require_once API_ROOT_PATH . '/inc/encryption_utils.php';
+                require_once API_ROOT_PATH.'/inc/encryption_utils.php';
                 $encryptedPrivateKey = encrypt_with_session_key($privateKeyClear, $sessionKey);
 
                 if ($encryptedPrivateKey === false) {
@@ -285,7 +285,7 @@ 
         if (count($userFunctionId) > 0) {
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('roles_values') . '
+                FROM ' . prefixTable('roles_values').'
                 WHERE role_id IN %li  AND type IN ("W", "ND", "NE", "NDNE", "R")',
                 $userFunctionId
             );
@@ -311,7 +311,7 @@ 
         $inc = 0;
         $rows = DB::query(
             'SELECT id, id_tree 
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE restricted_to LIKE %s'.
             (count($userFunctionId) > 0 ? ' AND id_tree NOT IN %li' : ''),
             $userInfo['id'],
@@ -326,8 +326,8 @@ 
         // Check for the users roles if some specific rights exist on items
         $rows = DB::query(
             '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 '.(count($userFunctionId) > 0 ? ' id_tree NOT IN %li AND ' : '').' i.id_tree != ""
             ORDER BY i.id_tree ASC',
             count($userFunctionId) > 0 ? $userFunctionId : DB::sqleval('0')
@@ -343,7 +343,7 @@ 
         // Add all personal folders
         $rows = DB::queryFirstRow(
             'SELECT id 
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %i AND personal_folder = 1'.
             (count($userFunctionId) > 0 ? ' AND id NOT IN %li' : ''),
             $userInfo['id'],

api/inc/bootstrap.php

Spacing +12 added lines, -12 removed lines

@@ -25,18 +25,18 @@ 
 
 use TeampassClasses\ConfigManager\ConfigManager;
 
-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';
 
 // 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
@@ -56,9 +56,9 @@ 
         return;
     }
     // Perform the action
-    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);
 }
 
@@ -80,9 +80,9 @@ 
         return;
     }
     // Perform the action
-    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);
 }
 
@@ -139,7 +139,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) {
@@ -169,7 +169,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/encryption_utils.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 function encrypt_with_session_key(string $data, string $key)
 {
     if (strlen($key) !== 32) {
-        error_log('[API] encrypt_with_session_key: Invalid key length. Expected 32 bytes, got ' . strlen($key));
+        error_log('[API] encrypt_with_session_key: Invalid key length. Expected 32 bytes, got '.strlen($key));
         return false;
     }
 
@@ -74,10 +74,10 @@ 
 
         // Combine nonce + tag + ciphertext and encode in base64
         // Format: [12 bytes nonce][16 bytes tag][variable ciphertext]
-        return base64_encode($nonce . $tag . $ciphertext);
+        return base64_encode($nonce.$tag.$ciphertext);
 
     } catch (Exception $e) {
-        error_log('[API] encrypt_with_session_key: Exception - ' . $e->getMessage());
+        error_log('[API] encrypt_with_session_key: Exception - '.$e->getMessage());
         return false;
     }
 }
@@ -95,7 +95,7 @@ 
 function decrypt_with_session_key(string $encryptedData, string $key)
 {
     if (strlen($key) !== 32) {
-        error_log('[API] decrypt_with_session_key: Invalid key length. Expected 32 bytes, got ' . strlen($key));
+        error_log('[API] decrypt_with_session_key: Invalid key length. Expected 32 bytes, got '.strlen($key));
         return false;
     }
 
@@ -136,7 +136,7 @@ 
         return $plaintext;
 
     } catch (Exception $e) {
-        error_log('[API] decrypt_with_session_key: Exception - ' . $e->getMessage());
+        error_log('[API] decrypt_with_session_key: Exception - '.$e->getMessage());
         return false;
     }
 }

pages/api.php

Spacing +25 added lines, -25 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('api') === 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;
 }
 
@@ -160,7 +160,7 @@ 
                                     <?php
                                     $rowsKeys = DB::query(
                                         'SELECT *
-                                        FROM ' . prefixTable('api') . '
+                                        FROM ' . prefixTable('api').'
                                         WHERE type = %s
                                         ORDER BY timestamp ASC',
                                         'key'
@@ -183,15 +183,15 @@ 
                                             <?php
                                             foreach ($rowsKeys as $key) {
                                                 echo '
-                                                    <tr data-id="' . $key['increment_id'] . '">
-                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-key" title="' . $lang->get('del_button') . '"></i></td>
-                                                    <td><span class="edit-api-key pointer">' . $key['label'] . '</span></td>
-                                                    <td>' . $key['value']. '</td>   
-                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="' . $key['increment_id'] . '"></i></td>                   
+                                                    <tr data-id="' . $key['increment_id'].'">
+                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-key" title="' . $lang->get('del_button').'"></i></td>
+                                                    <td><span class="edit-api-key pointer">' . $key['label'].'</span></td>
+                                                    <td>' . $key['value'].'</td>   
+                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="'.$key['increment_id'].'"></i></td>                   
                                                 </tr>';
                                             } ?>
                                         </tbody>
@@ -226,7 +226,7 @@ 
                                 <div class="col-12 mt-4" id="table-api-ip">
                                     <?php
                                     $rowsIps = DB::query(
-                                                'SELECT increment_id, label, timestamp value FROM ' . prefixTable('api') . '
+                                                'SELECT increment_id, label, timestamp value FROM '.prefixTable('api').'
                                                 WHERE type = %s
                                                 ORDER BY timestamp ASC',
                                                 'ip'
@@ -244,10 +244,10 @@ 
                                             <?php
                                             foreach ($rowsIps as $ip) {
                                                 echo '
-                                                <tr data-id="' . $ip['increment_id'] . '">
-                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-ip" title="' . $lang->get('del_button') . '"></i></td>
-                                                    <td><span class="edit-api-ip pointer" data-field="label">' . $ip['label'] . '</span></td>
-                                                    <td><span class="edit-api-ip pointer" data-field="value">' . $ip['value'] . '</span></td>
+                                                <tr data-id="' . $ip['increment_id'].'">
+                                                    <td width="50px"><i class="fas fa-trash infotip pointer delete-api-ip" title="' . $lang->get('del_button').'"></i></td>
+                                                    <td><span class="edit-api-ip pointer" data-field="label">' . $ip['label'].'</span></td>
+                                                    <td><span class="edit-api-ip pointer" data-field="value">' . $ip['value'].'</span></td>
                                                 </tr>';
                                             } ?>
                                         </tbody>
@@ -291,8 +291,8 @@ 
                                     <?php
                                     $rowsKeys = DB::query(
                                         'SELECT a.*, u.name, u.lastname, u.login
-                                        FROM ' . prefixTable('api') . ' AS a
-                                        INNER JOIN ' . prefixTable('users') . ' AS u ON a.user_id = u.id
+                                        FROM ' . prefixTable('api').' AS a
+                                        INNER JOIN ' . prefixTable('users').' AS u ON a.user_id = u.id
                                         WHERE a.type = %s AND u.disabled = %i AND u.deleted_at IS NULL AND u.id NOT IN %li AND u.admin = %i
                                         ORDER BY u.login ASC',
                                         'user',
@@ -316,13 +316,13 @@ 
                                             <?php
                                             foreach ($rowsKeys as $key) {
                                                 echo '
-                                                    <tr data-id="' . $key['increment_id'] . '">
-                                                    <td>' . $key['name'] . ' ' . $key['lastname'] . ' (<i>'.$key['login'].'</i>)</td>
-                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="' . $key['increment_id'] . '"></i></td>
-                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="' . $key['increment_id'] . '"></i></td>
+                                                    <tr data-id="' . $key['increment_id'].'">
+                                                    <td>' . $key['name'].' '.$key['lastname'].' (<i>'.$key['login'].'</i>)</td>
+                                                    <td><i class="fas '.((int) $key['enabled'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="enabled" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_create'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_create" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_read'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_read" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_update'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_update" data-increment-id="'.$key['increment_id'].'"></i></td>
+                                                    <td><i class="fas '.((int) $key['allowed_to_delete'] === 1 ? 'fa-toggle-on text-info' : 'fa-toggle-off').' mr-1 text-center pointer api-clickme-action" data-field="allowed_to_delete" data-increment-id="'.$key['increment_id'].'"></i></td>
                                                 </tr>';
                                             } ?>
                                         </tbody>