Passed
Pull Request — master (#4676)
by Nils
10:05 queued 03:59
created
sources/folders.queries.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -137,14 +137,14 @@  discard block
 block discarded – undo
137 137
                     && $t->personal_folder == 0
138 138
                 ) {
139 139
                     // get $t->parent_id
140
-                    $data = DB::queryFirstRow('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i', $t->parent_id);
140
+                    $data = DB::queryFirstRow('SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i', $t->parent_id);
141 141
                     if ($t->nlevel == 1) {
142 142
                         $data['title'] = $lang->get('root');
143 143
                     }
144 144
 
145 145
                     // get rights on this folder
146 146
                     $arrayRights = array();
147
-                    $rows = DB::query('SELECT fonction_id  FROM ' . prefixTable('rights') . ' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
147
+                    $rows = DB::query('SELECT fonction_id  FROM '.prefixTable('rights').' WHERE authorized=%i AND tree_id = %i', 1, $t->id);
148 148
                     foreach ($rows as $record) {
149 149
                         array_push($arrayRights, $record['fonction_id']);
150 150
                     }
@@ -162,8 +162,8 @@  discard block
 block discarded – undo
162 162
                         'SELECT m.valeur AS valeur, n.renewal_period AS renewal_period,
163 163
                         n.bloquer_creation AS bloquer_creation, n.bloquer_modification AS bloquer_modification,
164 164
                         n.fa_icon, n.fa_icon_selected
165
-                        FROM ' . prefixTable('misc') . ' AS m,
166
-                        ' . prefixTable('nested_tree') . ' AS n
165
+                        FROM ' . prefixTable('misc').' AS m,
166
+                        ' . prefixTable('nested_tree').' AS n
167 167
                         WHERE m.type=%s AND m.intitule = n.id AND m.intitule = %i',
168 168
                         'complex',
169 169
                         $t->id
@@ -191,16 +191,16 @@  discard block
 block discarded – undo
191 191
                         $arrayColumns['folderComplexity'] = '';
192 192
                     }
193 193
 
194
-                    if (is_null($node_data)=== false) {
194
+                    if (is_null($node_data) === false) {
195 195
                         $arrayColumns['renewalPeriod'] = (int) $node_data['renewal_period'];
196 196
                     } else {
197
-                        $arrayColumns['renewalPeriod']=0;
197
+                        $arrayColumns['renewalPeriod'] = 0;
198 198
                     }
199 199
 
200 200
                     //col7
201 201
                     $data7 = DB::queryFirstRow(
202 202
                         'SELECT bloquer_creation,bloquer_modification
203
-                        FROM ' . prefixTable('nested_tree') . '
203
+                        FROM ' . prefixTable('nested_tree').'
204 204
                         WHERE id = %i',
205 205
                         intval($t->id)
206 206
                     );
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
             // Get info about this folder
359 359
             $dataFolder = DB::queryFirstRow(
360 360
                 'SELECT *
361
-                FROM ' . prefixTable('nested_tree') . '
361
+                FROM ' . prefixTable('nested_tree').'
362 362
                 WHERE id = %i',
363 363
                 $inputData['id']
364 364
             );
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
             //check if parent folder is personal
395 395
             $dataParent = DB::queryFirstRow(
396 396
                 'SELECT personal_folder, bloquer_creation, bloquer_modification
397
-                FROM ' . prefixTable('nested_tree') . '
397
+                FROM ' . prefixTable('nested_tree').'
398 398
                 WHERE id = %i',
399 399
                 $inputData['parentId']
400 400
             );
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
                     // get complexity level for this folder
424 424
                     $data = DB::queryFirstRow(
425 425
                         'SELECT valeur
426
-                        FROM ' . prefixTable('misc') . '
426
+                        FROM ' . prefixTable('misc').'
427 427
                         WHERE intitule = %i AND type = %s',
428 428
                         $inputData['parentId'],
429 429
                         'complex'
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
                             array(
435 435
                                 'error' => true,
436 436
                                 'message' => $lang->get('error_folder_complexity_lower_than_top_folder')
437
-                                    . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]',
437
+                                    . ' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]',
438 438
                             ),
439 439
                             'encode'
440 440
                         );
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
             // Check if parent folder is personal
595 595
             $dataParent = DB::queryFirstRow(
596 596
                 'SELECT personal_folder
597
-                FROM ' . prefixTable('nested_tree') . '
597
+                FROM ' . prefixTable('nested_tree').'
598 598
                 WHERE id = %i',
599 599
                 $inputData['parentId']
600 600
             );
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
             echo prepareExchangedData(
635 635
                 array(
636 636
                     'error' => $creationStatus['error'],
637
-                    'message' => $creationStatus['error'] === true ? $lang->get('error_not_allowed_to') : $lang->get('folder_created') ,
637
+                    'message' => $creationStatus['error'] === true ? $lang->get('error_not_allowed_to') : $lang->get('folder_created'),
638 638
                     'newId' => $creationStatus['newId'],
639 639
                 ),
640 640
                 'encode'
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
                 echo prepareExchangedData(
683 683
                     array(
684 684
                         'error' => true,
685
-                        'message' => $lang->get('error_not_allowed_to'). " (You can't delete the root folder)",
685
+                        'message' => $lang->get('error_not_allowed_to')." (You can't delete the root folder)",
686 686
                     ),
687 687
                     'encode'
688 688
                 );
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
             // Ensure that user has access to all folders
693 693
             $foldersAccessible = DB::query(
694 694
                 'SELECT id
695
-                FROM ' . prefixTable('nested_tree') . '
695
+                FROM ' . prefixTable('nested_tree').'
696 696
                 WHERE id IN %li AND id IN %li',
697 697
                 $post_folders,
698 698
                 $session->get('user-accessible_folders')
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
                 echo prepareExchangedData(
707 707
                     array(
708 708
                         'error' => true,
709
-                        'message' => $lang->get('error_not_allowed_to') . ' (The following folders are not accessible or do not exist: ' . implode(', ', $missingFolders) . ')',
709
+                        'message' => $lang->get('error_not_allowed_to').' (The following folders are not accessible or do not exist: '.implode(', ', $missingFolders).')',
710 710
                     ),
711 711
                     'encode'
712 712
                 );
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
                 // Check if parent folder is personal
724 724
                 $dataParent = DB::queryFirstRow(
725 725
                     'SELECT personal_folder
726
-                    FROM ' . prefixTable('nested_tree') . '
726
+                    FROM ' . prefixTable('nested_tree').'
727 727
                     WHERE id = %i',
728 728
                     $folderId
729 729
                 );
@@ -769,10 +769,10 @@  discard block
 block discarded – undo
769 769
                                 prefixTable('misc'),
770 770
                                 array(
771 771
                                     'type' => 'folder_deleted',
772
-                                    'intitule' => 'f' . $thisSubFolders->id,
773
-                                    'valeur' => $thisSubFolders->id . ', ' . $thisSubFolders->parent_id . ', ' .
774
-                                        $thisSubFolders->title . ', ' . $thisSubFolders->nleft . ', ' . $thisSubFolders->nright . ', ' .
775
-                                        $thisSubFolders->nlevel . ', 0, 0, 0, 0',
772
+                                    'intitule' => 'f'.$thisSubFolders->id,
773
+                                    'valeur' => $thisSubFolders->id.', '.$thisSubFolders->parent_id.', '.
774
+                                        $thisSubFolders->title.', '.$thisSubFolders->nleft.', '.$thisSubFolders->nright.', '.
775
+                                        $thisSubFolders->nlevel.', 0, 0, 0, 0',
776 776
                                     'created_at' => time(),
777 777
                                 )
778 778
                             );
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 
782 782
                             //delete items & logs
783 783
                             $itemsInSubFolder = DB::query(
784
-                                'SELECT id FROM ' . prefixTable('items') . ' 
784
+                                'SELECT id FROM '.prefixTable('items').' 
785 785
                                 WHERE id_tree=%i', 
786 786
                                 $thisSubFolders->id
787 787
                             );
@@ -811,7 +811,7 @@  discard block
 block discarded – undo
811 811
                                 }
812 812
 
813 813
                                 //Update CACHE table
814
-                                updateCacheTable('delete_value',(int) $item['id']);
814
+                                updateCacheTable('delete_value', (int) $item['id']);
815 815
                             }
816 816
 
817 817
                             //Actualize the variable
@@ -918,7 +918,7 @@  discard block
 block discarded – undo
918 918
             // Check if target parent folder is personal
919 919
             $dataParent = DB::queryFirstRow(
920 920
                 'SELECT personal_folder
921
-                FROM ' . prefixTable('nested_tree') . '
921
+                FROM ' . prefixTable('nested_tree').'
922 922
                 WHERE id = %i',
923 923
                 $post_target_folder_id
924 924
             );
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
972 972
                 // get complexity of current node
973 973
                 $nodeComplexity = DB::queryFirstRow(
974 974
                     'SELECT valeur
975
-                    FROM ' . prefixTable('misc') . '
975
+                    FROM ' . prefixTable('misc').'
976 976
                     WHERE intitule = %i AND type= %s',
977 977
                     $nodeInfo->id,
978 978
                     'complex'
@@ -1049,7 +1049,7 @@  discard block
 block discarded – undo
1049 1049
                 // If it is a subfolder, then give access to it for all roles that allows the parent folder
1050 1050
                 $rows = DB::query(
1051 1051
                     'SELECT role_id, type
1052
-                    FROM ' . prefixTable('roles_values') . '
1052
+                    FROM ' . prefixTable('roles_values').'
1053 1053
                     WHERE folder_id = %i',
1054 1054
                     $parentId
1055 1055
                 );
@@ -1057,7 +1057,7 @@  discard block
 block discarded – undo
1057 1057
                     // Add access to this subfolder after checking that it is not already set
1058 1058
                     DB::query(
1059 1059
                         'SELECT *
1060
-                        FROM ' . prefixTable('roles_values') . '
1060
+                        FROM ' . prefixTable('roles_values').'
1061 1061
                         WHERE folder_id = %i AND role_id = %i',
1062 1062
                         $newFolderId,
1063 1063
                         $record['role_id']
@@ -1077,7 +1077,7 @@  discard block
 block discarded – undo
1077 1077
                 // if parent folder has Custom Fields Categories then add to this child one too
1078 1078
                 $rows = DB::query(
1079 1079
                     'SELECT id_category
1080
-                    FROM ' . prefixTable('categories_folders') . '
1080
+                    FROM ' . prefixTable('categories_folders').'
1081 1081
                     WHERE id_folder = %i',
1082 1082
                     $nodeInfo->id
1083 1083
                 );
@@ -1096,7 +1096,7 @@  discard block
 block discarded – undo
1096 1096
 
1097 1097
                 $rows = DB::query(
1098 1098
                     'SELECT *
1099
-                    FROM ' . prefixTable('items') . '
1099
+                    FROM ' . prefixTable('items').'
1100 1100
                     WHERE id_tree = %i',
1101 1101
                     $nodeInfo->id
1102 1102
                 );
@@ -1105,7 +1105,7 @@  discard block
 block discarded – undo
1105 1105
                     // if it is then don't copy it
1106 1106
                     $item_deleted = DB::queryFirstRow(
1107 1107
                         'SELECT *
1108
-                        FROM ' . prefixTable('log_items') . '
1108
+                        FROM ' . prefixTable('log_items').'
1109 1109
                         WHERE id_item = %i AND action = %s
1110 1110
                         ORDER BY date DESC
1111 1111
                         LIMIT 0, 1',
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
 
1117 1117
                     $item_restored = DB::queryFirstRow(
1118 1118
                         'SELECT *
1119
-                        FROM ' . prefixTable('log_items') . '
1119
+                        FROM ' . prefixTable('log_items').'
1120 1120
                         WHERE id_item = %i AND action = %s
1121 1121
                         ORDER BY date DESC
1122 1122
                         LIMIT 0, 1',
@@ -1131,7 +1131,7 @@  discard block
 block discarded – undo
1131 1131
                         // Get the ITEM object key for the user
1132 1132
                         $userKey = DB::queryFirstRow(
1133 1133
                             'SELECT share_key
1134
-                            FROM ' . prefixTable('sharekeys_items') . '
1134
+                            FROM ' . prefixTable('sharekeys_items').'
1135 1135
                             WHERE user_id = %i AND object_id = %i',
1136 1136
                             $session->get('user-id'),
1137 1137
                             $record['id']
@@ -1293,7 +1293,7 @@  discard block
 block discarded – undo
1293 1293
                     // Get path
1294 1294
                     $text = '';
1295 1295
                     foreach ($tree->getPath($folder->id, false) as $fld) {
1296
-                        $text .= empty($text) === true ? '     [<i>' . $fld->title : ' > ' . $fld->title;
1296
+                        $text .= empty($text) === true ? '     [<i>'.$fld->title : ' > '.$fld->title;
1297 1297
                     }
1298 1298
 
1299 1299
                     // Save array
@@ -1303,7 +1303,7 @@  discard block
 block discarded – undo
1303 1303
                             'id' => (int) $folder->id,
1304 1304
                             'label' => $folder->title,
1305 1305
                             'level' => $folder->nlevel,
1306
-                            'path' => empty($text) === true ? '' : $text . '</i>]'
1306
+                            'path' => empty($text) === true ? '' : $text.'</i>]'
1307 1307
                         )
1308 1308
                     );
1309 1309
                 }
Please login to merge, or discard this patch.