@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | // get count of Items in this folder |
| 73 | 73 | $get = DB::queryFirstRow( |
| 74 | 74 | 'SELECT count(*) as num_results |
| 75 | - FROM ' . prefixTable('items') . ' |
|
| 75 | + FROM ' . prefixTable('items').' |
|
| 76 | 76 | WHERE inactif = %i AND id_tree = %i', |
| 77 | 77 | 0, |
| 78 | 78 | $child->id |
@@ -81,14 +81,14 @@ discard block |
||
| 81 | 81 | $ret[$child->id]['id'] = $child->id; |
| 82 | 82 | |
| 83 | 83 | // get number of subfolders |
| 84 | - $nodeDescendants =$tree->getDescendants($child->id, false, false, true); |
|
| 84 | + $nodeDescendants = $tree->getDescendants($child->id, false, false, true); |
|
| 85 | 85 | $ret[$child->id]['subfoldersCount'] = count($nodeDescendants); |
| 86 | 86 | |
| 87 | 87 | // get items number in subfolders |
| 88 | 88 | if (count($nodeDescendants) > 0) { |
| 89 | 89 | $get = DB::queryFirstRow( |
| 90 | 90 | 'SELECT count(*) as num_results |
| 91 | - FROM ' . prefixTable('items') . ' |
|
| 91 | + FROM ' . prefixTable('items').' |
|
| 92 | 92 | WHERE inactif = %i AND id_tree IN (%l)', |
| 93 | 93 | 0, |
| 94 | 94 | implode(',', $nodeDescendants) |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | // Get item key |
| 140 | 140 | $itemKey = DB::queryFirstRow( |
| 141 | 141 | 'SELECT share_key |
| 142 | - FROM ' . prefixTable('sharekeys_items') . ' |
|
| 142 | + FROM ' . prefixTable('sharekeys_items').' |
|
| 143 | 143 | WHERE user_id = %i AND object_id = %i', |
| 144 | 144 | TP_USER_ID, |
| 145 | 145 | $item['itemId'] |
@@ -73,64 +73,64 @@ |
||
| 73 | 73 | { |
| 74 | 74 | // Delete all item keys for which no user exist |
| 75 | 75 | DB::query( |
| 76 | - 'DELETE k FROM ' . prefixTable('sharekeys_items') . ' k |
|
| 77 | - LEFT JOIN ' . prefixTable('users') . ' u ON k.user_id = u.id |
|
| 76 | + 'DELETE k FROM '.prefixTable('sharekeys_items').' k |
|
| 77 | + LEFT JOIN ' . prefixTable('users').' u ON k.user_id = u.id |
|
| 78 | 78 | WHERE u.id IS NULL OR u.deleted_at IS NOT NULL' |
| 79 | 79 | ); |
| 80 | 80 | |
| 81 | 81 | // Delete all files keys for which no user exist |
| 82 | 82 | DB::query( |
| 83 | - 'DELETE k FROM ' . prefixTable('sharekeys_files') . ' k |
|
| 84 | - LEFT JOIN ' . prefixTable('users') . ' u ON k.user_id = u.id |
|
| 83 | + 'DELETE k FROM '.prefixTable('sharekeys_files').' k |
|
| 84 | + LEFT JOIN ' . prefixTable('users').' u ON k.user_id = u.id |
|
| 85 | 85 | WHERE u.id IS NULL OR u.deleted_at IS NOT NULL' |
| 86 | 86 | ); |
| 87 | 87 | |
| 88 | 88 | // Delete all fields keys for which no user exist |
| 89 | 89 | DB::query( |
| 90 | - 'DELETE k FROM ' . prefixTable('sharekeys_fields') . ' k |
|
| 91 | - LEFT JOIN ' . prefixTable('users') . ' u ON k.user_id = u.id |
|
| 90 | + 'DELETE k FROM '.prefixTable('sharekeys_fields').' k |
|
| 91 | + LEFT JOIN ' . prefixTable('users').' u ON k.user_id = u.id |
|
| 92 | 92 | WHERE u.id IS NULL OR u.deleted_at IS NOT NULL' |
| 93 | 93 | ); |
| 94 | 94 | |
| 95 | 95 | // Delete all item logs for which no user exist |
| 96 | 96 | DB::query( |
| 97 | - 'DELETE l FROM ' . prefixTable('log_items') . ' l |
|
| 98 | - LEFT JOIN ' . prefixTable('users') . ' u ON l.id_user = u.id |
|
| 97 | + 'DELETE l FROM '.prefixTable('log_items').' l |
|
| 98 | + LEFT JOIN ' . prefixTable('users').' u ON l.id_user = u.id |
|
| 99 | 99 | WHERE u.id IS NULL OR u.deleted_at IS NOT NULL' |
| 100 | 100 | ); |
| 101 | 101 | |
| 102 | 102 | // Delete all system logs for which no user exist |
| 103 | 103 | DB::query( |
| 104 | - 'DELETE l FROM ' . prefixTable('log_system') . ' l |
|
| 105 | - LEFT JOIN ' . prefixTable('users') . ' u ON l.qui = u.id |
|
| 104 | + 'DELETE l FROM '.prefixTable('log_system').' l |
|
| 105 | + LEFT JOIN ' . prefixTable('users').' u ON l.qui = u.id |
|
| 106 | 106 | WHERE u.id IS NULL OR u.deleted_at IS NOT NULL' |
| 107 | 107 | ); |
| 108 | 108 | |
| 109 | 109 | // Delete all item keys for which no object exist |
| 110 | 110 | DB::query( |
| 111 | - 'DELETE k FROM ' . prefixTable('sharekeys_items') . ' k |
|
| 112 | - LEFT JOIN ' . prefixTable('items') . ' i ON k.object_id = i.id |
|
| 111 | + 'DELETE k FROM '.prefixTable('sharekeys_items').' k |
|
| 112 | + LEFT JOIN ' . prefixTable('items').' i ON k.object_id = i.id |
|
| 113 | 113 | WHERE i.id IS NULL' |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | 116 | // Delete all files keys for which no object exist |
| 117 | 117 | DB::query( |
| 118 | - 'DELETE k FROM ' . prefixTable('sharekeys_files') . ' k |
|
| 119 | - LEFT JOIN ' . prefixTable('items') . ' i ON k.object_id = i.id |
|
| 118 | + 'DELETE k FROM '.prefixTable('sharekeys_files').' k |
|
| 119 | + LEFT JOIN ' . prefixTable('items').' i ON k.object_id = i.id |
|
| 120 | 120 | WHERE i.id IS NULL' |
| 121 | 121 | ); |
| 122 | 122 | |
| 123 | 123 | // Delete all fields keys for which no object exist |
| 124 | 124 | DB::query( |
| 125 | - 'DELETE k FROM ' . prefixTable('sharekeys_fields') . ' k |
|
| 126 | - LEFT JOIN ' . prefixTable('items') . ' i ON k.object_id = i.id |
|
| 125 | + 'DELETE k FROM '.prefixTable('sharekeys_fields').' k |
|
| 126 | + LEFT JOIN ' . prefixTable('items').' i ON k.object_id = i.id |
|
| 127 | 127 | WHERE i.id IS NULL' |
| 128 | 128 | ); |
| 129 | 129 | |
| 130 | 130 | // Delete all item logs for which no object exist |
| 131 | 131 | DB::query( |
| 132 | - 'DELETE l FROM ' . prefixTable('log_items') . ' l |
|
| 133 | - LEFT JOIN ' . prefixTable('items') . ' i ON l.id_item = i.id |
|
| 132 | + 'DELETE l FROM '.prefixTable('log_items').' l |
|
| 133 | + LEFT JOIN ' . prefixTable('items').' i ON l.id_item = i.id |
|
| 134 | 134 | WHERE i.id IS NULL' |
| 135 | 135 | ); |
| 136 | 136 | |
@@ -47,8 +47,8 @@ |
||
| 47 | 47 | */ |
| 48 | 48 | public function log(string $message, string $level = 'INFO') { |
| 49 | 49 | if (!empty($this->settings['enable_tasks_log'])) { |
| 50 | - $formattedMessage = date($this->settings['date_format'] . ' ' . $this->settings['time_format']) . |
|
| 51 | - " - [$level] $message" . PHP_EOL; |
|
| 50 | + $formattedMessage = date($this->settings['date_format'].' '.$this->settings['time_format']). |
|
| 51 | + " - [$level] $message".PHP_EOL; |
|
| 52 | 52 | |
| 53 | 53 | if (!empty($this->logFile)) { |
| 54 | 54 | // WWrite to the specified log file |