@@ -1228,7 +1228,9 @@ discard block |
||
| 1228 | 1228 | ); |
| 1229 | 1229 | |
| 1230 | 1230 | // Create a task to create sharekeys for users |
| 1231 | - if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1231 | + if (WIP=== true) { |
|
| 1232 | + error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw); |
|
| 1233 | + } |
|
| 1232 | 1234 | $tasksToBePerformed = ['item_password']; |
| 1233 | 1235 | $encryptionTaskIsRequested = true; |
| 1234 | 1236 | } else { |
@@ -1548,7 +1550,9 @@ discard block |
||
| 1548 | 1550 | |
| 1549 | 1551 | // create a task for all fields updated |
| 1550 | 1552 | if ($encryptionTaskIsRequested === true) { |
| 1551 | - if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1553 | + if (WIP === true) { |
|
| 1554 | + error_log('createTaskForItem - '.print_r($tasksToBePerformed, true)); |
|
| 1555 | + } |
|
| 1552 | 1556 | createTaskForItem( |
| 1553 | 1557 | 'item_update_create_keys', |
| 1554 | 1558 | array_unique($tasksToBePerformed), |
@@ -2055,7 +2059,9 @@ discard block |
||
| 2055 | 2059 | $inputData['itemId'] |
| 2056 | 2060 | ); |
| 2057 | 2061 | foreach ($rows as $record) { |
| 2058 | - if ($record['raison'] === NULL) continue; |
|
| 2062 | + if ($record['raison'] === NULL) { |
|
| 2063 | + continue; |
|
| 2064 | + } |
|
| 2059 | 2065 | $reason = explode(':', $record['raison']); |
| 2060 | 2066 | if (count($reason) > 0) { |
| 2061 | 2067 | $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' |
@@ -4571,7 +4577,9 @@ discard block |
||
| 4571 | 4577 | $inputData['itemId'] |
| 4572 | 4578 | ); |
| 4573 | 4579 | |
| 4574 | - if (WIP === true) error_log('Existing edition locks: '.DB::count()); |
|
| 4580 | + if (WIP === true) { |
|
| 4581 | + error_log('Existing edition locks: '.DB::count()); |
|
| 4582 | + } |
|
| 4575 | 4583 | |
| 4576 | 4584 | // Check if item has no edition lock |
| 4577 | 4585 | if ((int) DB::count() > 0 ) { |
@@ -4584,7 +4592,9 @@ discard block |
||
| 4584 | 4592 | } else { |
| 4585 | 4593 | $delay = EDITION_LOCK_PERIOD; // One day delay |
| 4586 | 4594 | } |
| 4587 | - if (WIP === true) error_log('delay: ' . $delay); |
|
| 4595 | + if (WIP === true) { |
|
| 4596 | + error_log('delay: ' . $delay); |
|
| 4597 | + } |
|
| 4588 | 4598 | |
| 4589 | 4599 | // We remove old edition locks if delay is expired meaning more than 1 day long |
| 4590 | 4600 | if (round(abs(time() - $dataTmp['timestamp']),0) > $delay) { |
@@ -4592,7 +4602,9 @@ discard block |
||
| 4592 | 4602 | // In this case, delete edition lock and possible ongoing processes |
| 4593 | 4603 | // and continue editing this time |
| 4594 | 4604 | // We coonsidere if the most recent item is still locked then all other locks can be removed |
| 4595 | - if (WIP === true) error_log('Delay is expired, removing old locks'); |
|
| 4605 | + if (WIP === true) { |
|
| 4606 | + error_log('Delay is expired, removing old locks'); |
|
| 4607 | + } |
|
| 4596 | 4608 | foreach ($dataItemEditionLocks as $itemEditionLock) { |
| 4597 | 4609 | // delete lock |
| 4598 | 4610 | DB::delete( |
@@ -4859,8 +4871,9 @@ discard block |
||
| 4859 | 4871 | $ids = $tree->getDescendants($folder['id'], true, false, true); |
| 4860 | 4872 | |
| 4861 | 4873 | // This folder is owned by user |
| 4862 | - if (in_array($inputData['folderId'], $ids)) |
|
| 4863 | - $accessLevel = 30; |
|
| 4874 | + if (in_array($inputData['folderId'], $ids)) { |
|
| 4875 | + $accessLevel = 30; |
|
| 4876 | + } |
|
| 4864 | 4877 | } |
| 4865 | 4878 | } |
| 4866 | 4879 | |
@@ -54,13 +54,17 @@ discard block |
||
| 54 | 54 | ); |
| 55 | 55 | |
| 56 | 56 | if (empty($subtasks)) { |
| 57 | - if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}"); |
|
| 57 | + if (LOG_TASKS=== true) { |
|
| 58 | + $this->logger->log("No subtask was found for task {$this->taskId}"); |
|
| 59 | + } |
|
| 58 | 60 | return; |
| 59 | 61 | } |
| 60 | 62 | |
| 61 | 63 | // Process each subtask |
| 62 | 64 | foreach ($subtasks as $subtask) { |
| 63 | - if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}"); |
|
| 65 | + if (LOG_TASKS=== true) { |
|
| 66 | + $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}"); |
|
| 67 | + } |
|
| 64 | 68 | $this->processGenerateUserKeysSubtask($subtask, $arguments); |
| 65 | 69 | } |
| 66 | 70 | |
@@ -97,7 +101,9 @@ discard block |
||
| 97 | 101 | $subtask['increment_id'] |
| 98 | 102 | ); |
| 99 | 103 | |
| 100 | - if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO'); |
|
| 104 | + if (LOG_TASKS=== true) { |
|
| 105 | + $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO'); |
|
| 106 | + } |
|
| 101 | 107 | switch ($taskData['step'] ?? '') { |
| 102 | 108 | case 'step0': |
| 103 | 109 | $this->generateNewUserStep0($arguments); |
@@ -29,7 +29,9 @@ discard block |
||
| 29 | 29 | trait ItemHandlerTrait { |
| 30 | 30 | |
| 31 | 31 | private function generateUserPasswordKeys($arguments) { |
| 32 | - if (LOG_TASKS=== true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG'); |
|
| 32 | + if (LOG_TASKS=== true) { |
|
| 33 | + $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG'); |
|
| 34 | + } |
|
| 33 | 35 | // Generate keys for user passwords |
| 34 | 36 | storeUsersShareKey( |
| 35 | 37 | prefixTable('sharekeys_items'), |
@@ -49,7 +51,9 @@ discard block |
||
| 49 | 51 | * @param array $taskData |
| 50 | 52 | */ |
| 51 | 53 | private function generateUserFileKeys($taskData) { |
| 52 | - if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG'); |
|
| 54 | + if (LOG_TASKS=== true) { |
|
| 55 | + $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG'); |
|
| 56 | + } |
|
| 53 | 57 | foreach($taskData['files_keys'] as $file) { |
| 54 | 58 | storeUsersShareKey( |
| 55 | 59 | prefixTable('sharekeys_files'), |
@@ -70,7 +74,9 @@ discard block |
||
| 70 | 74 | * @param array $arguments |
| 71 | 75 | */ |
| 72 | 76 | private function generateUserFieldKeys($arguments) { |
| 73 | - if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG'); |
|
| 77 | + if (LOG_TASKS=== true) { |
|
| 78 | + $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG'); |
|
| 79 | + } |
|
| 74 | 80 | foreach($arguments['fields_keys'] as $field) { |
| 75 | 81 | $this->logger->log('Processing generateUserFieldKeys for: ' . $field['object_id'], 'DEBUG'); |
| 76 | 82 | storeUsersShareKey( |
@@ -55,7 +55,9 @@ discard block |
||
| 55 | 55 | public function processBackgroundTasks() { |
| 56 | 56 | // Prevent multiple concurrent executions |
| 57 | 57 | if (!$this->acquireProcessLock()) { |
| 58 | - if (LOG_TASKS=== true) $this->logger->log('Process already running', 'INFO'); |
|
| 58 | + if (LOG_TASKS=== true) { |
|
| 59 | + $this->logger->log('Process already running', 'INFO'); |
|
| 60 | + } |
|
| 59 | 61 | return false; |
| 60 | 62 | } |
| 61 | 63 | |
@@ -64,7 +66,9 @@ discard block |
||
| 64 | 66 | $this->processTaskBatches(); |
| 65 | 67 | $this->performMaintenanceTasks(); |
| 66 | 68 | } catch (Exception $e) { |
| 67 | - if (LOG_TASKS=== true) $this->logger->log('Task processing error: ' . $e->getMessage(), 'ERROR'); |
|
| 69 | + if (LOG_TASKS=== true) { |
|
| 70 | + $this->logger->log('Task processing error: ' . $e->getMessage(), 'ERROR'); |
|
| 71 | + } |
|
| 68 | 72 | } finally { |
| 69 | 73 | $this->releaseProcessLock(); |
| 70 | 74 | } |
@@ -131,7 +135,9 @@ discard block |
||
| 131 | 135 | |
| 132 | 136 | // Check if the maximum number of parallel tasks is reached |
| 133 | 137 | if ($runningTasks >= $this->maxParallelTasks) { |
| 134 | - if (LOG_TASKS=== true) $this->logger->log('Wait ... '.$runningTasks.' out of '.$this->maxParallelTasks.' are already running ', 'INFO'); |
|
| 138 | + if (LOG_TASKS=== true) { |
|
| 139 | + $this->logger->log('Wait ... '.$runningTasks.' out of '.$this->maxParallelTasks.' are already running ', 'INFO'); |
|
| 140 | + } |
|
| 135 | 141 | return; |
| 136 | 142 | } |
| 137 | 143 | |
@@ -149,7 +155,9 @@ discard block |
||
| 149 | 155 | ); |
| 150 | 156 | |
| 151 | 157 | foreach ($tasks as $task) { |
| 152 | - if (LOG_TASKS=== true) $this->logger->log('Launching '.$task['increment_id'], 'INFO'); |
|
| 158 | + if (LOG_TASKS=== true) { |
|
| 159 | + $this->logger->log('Launching '.$task['increment_id'], 'INFO'); |
|
| 160 | + } |
|
| 153 | 161 | $this->processIndividualTask($task); |
| 154 | 162 | } |
| 155 | 163 | } |
@@ -160,7 +168,9 @@ discard block |
||
| 160 | 168 | * @param array $task The task to process. |
| 161 | 169 | */ |
| 162 | 170 | private function processIndividualTask(array $task) { |
| 163 | - if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($task, true), 'INFO'); |
|
| 171 | + if (LOG_TASKS=== true) { |
|
| 172 | + $this->logger->log('Processing task: ' . print_r($task, true), 'INFO'); |
|
| 173 | + } |
|
| 164 | 174 | |
| 165 | 175 | // Store progress in the database |
| 166 | 176 | DB::update( |
@@ -275,7 +285,9 @@ discard block |
||
| 275 | 285 | $taskIds |
| 276 | 286 | ); |
| 277 | 287 | |
| 278 | - if (LOG_TASKS=== true) $this->logger->log('Old finished tasks cleaned: ' . count($taskIds), 'INFO'); |
|
| 288 | + if (LOG_TASKS=== true) { |
|
| 289 | + $this->logger->log('Old finished tasks cleaned: ' . count($taskIds), 'INFO'); |
|
| 290 | + } |
|
| 279 | 291 | } |
| 280 | 292 | } |
| 281 | 293 | |
@@ -65,7 +65,9 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function execute() { |
| 67 | 67 | try { |
| 68 | - if (LOG_TASKS=== true) $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG'); |
|
| 68 | + if (LOG_TASKS=== true) { |
|
| 69 | + $this->logger->log('Processing task: ' . print_r($this->taskData, true), 'DEBUG'); |
|
| 70 | + } |
|
| 69 | 71 | // Dispatch selon le type de processus |
| 70 | 72 | switch ($this->processType) { |
| 71 | 73 | case 'item_copy': |
@@ -137,7 +139,9 @@ discard block |
||
| 137 | 139 | $arguments = ''; |
| 138 | 140 | } |
| 139 | 141 | |
| 140 | - if (LOG_TASKS=== true) $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG'); |
|
| 142 | + if (LOG_TASKS=== true) { |
|
| 143 | + $this->logger->log('Process: '.$this->processType.' -- '.print_r($arguments, true), 'DEBUG'); |
|
| 144 | + } |
|
| 141 | 145 | |
| 142 | 146 | // Add 'arguments' only if not empty |
| 143 | 147 | if (!empty($arguments)) { |
@@ -151,7 +155,9 @@ discard block |
||
| 151 | 155 | 'increment_id = %i', |
| 152 | 156 | $this->taskId |
| 153 | 157 | ); |
| 154 | - if (LOG_TASKS=== true) $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG'); |
|
| 158 | + if (LOG_TASKS=== true) { |
|
| 159 | + $this->logger->log('Finishing task: ' . $this->taskId, 'DEBUG'); |
|
| 160 | + } |
|
| 155 | 161 | } |
| 156 | 162 | |
| 157 | 163 | /** |
@@ -194,7 +200,9 @@ discard block |
||
| 194 | 200 | |
| 195 | 201 | // Check if there are any subtasks to process |
| 196 | 202 | if (empty($subtasks)) { |
| 197 | - if (LOG_TASKS=== true) $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG'); |
|
| 203 | + if (LOG_TASKS=== true) { |
|
| 204 | + $this->logger->log('No subtask was found for task: ' . $this->taskId, 'DEBUG'); |
|
| 205 | + } |
|
| 198 | 206 | return; |
| 199 | 207 | } |
| 200 | 208 | |
@@ -204,7 +212,9 @@ discard block |
||
| 204 | 212 | // Get the subtask data |
| 205 | 213 | $subtaskData = json_decode($subtask['task'], true); |
| 206 | 214 | |
| 207 | - if (LOG_TASKS=== true) $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG'); |
|
| 215 | + if (LOG_TASKS=== true) { |
|
| 216 | + $this->logger->log('Processing subtask: ' . $subtaskData['step'], 'DEBUG'); |
|
| 217 | + } |
|
| 208 | 218 | |
| 209 | 219 | // Process the subtask based on its type |
| 210 | 220 | switch ($subtaskData['step'] ?? '') { |