nilsteampassnet / TeamPass

sources/import.queries.php

Spacing +35 added lines, -35 removed lines

@@ -79,7 +79,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;
 }
 
@@ -167,7 +167,7 @@ 
         );
 
         // Initialisation
-        $file = $SETTINGS['path_to_files_folder'] . '/' . $data['valeur'];
+        $file = $SETTINGS['path_to_files_folder'].'/'.$data['valeur'];
         $importation_possible = true;
         $valuesToImport = [];
         $items_number = 0;
@@ -224,26 +224,26 @@ 
                 'ISO-8859-1',
                 'ISO-8859-15',
                 'Windows-1252',
-                'Windows-1251',  // Cyrillique
-                'CP1251',        // Cyrillique alternatif
-                'KOI8-R',        // Cyrillique russe
-                'Shift_JIS',     // Japonais
-                'EUC-JP',        // Japonais
-                'ISO-2022-JP',   // Japonais
-                'TIS-620',       // Thaï
-                'Windows-874',   // Thaï Windows
-                'Big5',          // Chinois traditionnel
-                'GB2312',        // Chinois simplifié
-                'GBK',           // Chinois simplifié étendu
-                'EUC-KR',        // Coréen
-                'ISO-8859-2',    // Europe centrale
-                'ISO-8859-5',    // Cyrillique ISO
-                'ISO-8859-7',    // Grec
-                'Windows-1250',  // Europe centrale
-                'Windows-1253',  // Grec
-                'Windows-1254',  // Turc
-                'Windows-1255',  // Hébreu
-                'Windows-1256',  // Arabe
+                'Windows-1251', // Cyrillique
+                'CP1251', // Cyrillique alternatif
+                'KOI8-R', // Cyrillique russe
+                'Shift_JIS', // Japonais
+                'EUC-JP', // Japonais
+                'ISO-2022-JP', // Japonais
+                'TIS-620', // Thaï
+                'Windows-874', // Thaï Windows
+                'Big5', // Chinois traditionnel
+                'GB2312', // Chinois simplifié
+                'GBK', // Chinois simplifié étendu
+                'EUC-KR', // Coréen
+                'ISO-8859-2', // Europe centrale
+                'ISO-8859-5', // Cyrillique ISO
+                'ISO-8859-7', // Grec
+                'Windows-1250', // Europe centrale
+                'Windows-1253', // Grec
+                'Windows-1254', // Turc
+                'Windows-1255', // Hébreu
+                'Windows-1256', // Arabe
             ];
 
             // Get the list of encodings supported by the system
@@ -286,7 +286,7 @@ 
 
         // Get the data and ensure columns are correctly mapped
         $interpreter = new Interpreter();
-        $interpreter->addObserver(function (array $row) use (&$valuesToImport, $header) {
+        $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) {
             $rowData = array_combine($header, $row);
 
             if ($rowData !== false) {
@@ -339,7 +339,7 @@ 
             // Handle multiple lignes description
             if (strpos($comments, '<br>') !== false || strpos($label, '<br>') !== false) {
                 $continue_on_next_line = true;
-                $comment .= " " . $label . " " . $comments;
+                $comment .= " ".$label." ".$comments;
             } else {
                 // Insert previous line if changing line
                 if (!empty($label)) {
@@ -348,7 +348,7 @@ 
                     // Insert in batch
                     $batchInsert[] = array(
                         'label'        => $label,
-                        'description'  => $comment . $comments,
+                        'description'  => $comment.$comments,
                         'pwd'          => $pwd,
                         'url'          => $url,
                         'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -379,7 +379,7 @@ 
             // Insert in batch
             $batchInsert[] = array(
                 'label'        => $label,
-                'description'  => $comment . $comments,
+                'description'  => $comment.$comments,
                 'pwd'          => $pwd,
                 'url'          => $url,
                 'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -403,10 +403,10 @@ 
             $values = [];
 
             foreach ($batchInsert as $data) {
-                $values[] = "('" . implode("','", array_map('addslashes', $data)) . "')";
+                $values[] = "('".implode("','", array_map('addslashes', $data))."')";
             }
 
-            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES " . implode(',', $values);
+            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES ".implode(',', $values);
 
             DB::query($sql);
         }
@@ -489,7 +489,7 @@ 
             $parentId = $dataReceived['folderId']; // Strating with provided folder
 
             foreach ($parts as $part) {
-                $currentPath = trim($currentPath . "/" . $part, "/");
+                $currentPath = trim($currentPath."/".$part, "/");
                 $currentFolder = $part;
 
                 // Check if this folder has already been created
@@ -550,7 +550,7 @@ 
                         // Get ID of existing folder
                         $ret = DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('nested_tree') . '
+                            FROM ' . prefixTable('nested_tree').'
                             WHERE title = %s',
                             $currentFolder
                         );
@@ -685,7 +685,7 @@ 
                 );
                 $newId = DB::insertId();
 
-                error_log('New item created with ID: ' . $newId);
+                error_log('New item created with ID: '.$newId);
 
                 // Create new task for the new item
                 // If it is not a personnal one
@@ -1074,7 +1074,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             $parentId = $arrFolders[$folder['parentFolderId']];
 
@@ -1145,7 +1145,7 @@ 
         DB::startTransaction();
 
         // Import all items
-        foreach($post_items as $item) {
+        foreach ($post_items as $item) {
             // get info about this folder
             $destinationFolderMore = DB::queryFirstRow(
                 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
@@ -1176,7 +1176,7 @@ 
                     'pw' => $cryptedStuff['encrypted'],
                     'pw_iv' => '',
                     'url' => substr($item['URL'], 0, 500),
-                    'id_tree' => isset($post_folders[$item['parentFolderId']]['id']) ? (int)$post_folders[$item['parentFolderId']]['id'] : 0,
+                    'id_tree' => isset($post_folders[$item['parentFolderId']]['id']) ? (int) $post_folders[$item['parentFolderId']]['id'] : 0,
                     'login' => substr($item['UserName'], 0, 500),
                     'anyone_can_modify' => $$inputData['editAll'],
                     'encryption_type' => 'teampass_aes',
@@ -1370,7 +1370,7 @@ 
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);