nilsteampassnet / TeamPass

sources/upload.files.php

Spacing +28 added lines, -28 removed lines

@@ -68,7 +68,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;
 }
 
@@ -115,7 +115,7 @@ 
     } else {
         // check if token is expired
         $data = DB::queryFirstRow(
-            'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s',
+            'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s',
             $session->get('user-id'),
             $post_user_token
         );
@@ -139,12 +139,12 @@ 
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
 if (null !== $post_type_upload && $post_type_upload === 'upload_profile_photo') {
-    $targetDir = $SETTINGS['cpassman_dir'] . '/includes/avatars';
+    $targetDir = $SETTINGS['cpassman_dir'].'/includes/avatars';
 } else {
     $targetDir = $SETTINGS['path_to_files_folder'];
 }
@@ -205,7 +205,7 @@ 
 
 // Validate file name (for our purposes we'll just remove invalid characters)
 $file_name = preg_replace(
-    '/[^' . $valid_chars_regex . '\.]/',
+    '/[^'.$valid_chars_regex.'\.]/',
     '',
     filter_var(
         strtolower(basename($_FILES['file']['name'])),
@@ -213,7 +213,7 @@ 
     )
 );
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-    handleUploadError('Invalid file name: ' . $file_name . '.');
+    handleUploadError('Invalid file name: '.$file_name.'.');
     return false;
 }
 
@@ -228,8 +228,8 @@ 
         $ext,
         explode(
             ',',
-            $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-                ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+            $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+                ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
         )
     ) === false
     && $post_type_upload !== 'import_items_from_keepass'
@@ -242,28 +242,28 @@ 
 
 // is destination folder writable
 if (is_writable($SETTINGS['path_to_files_folder']) === false) {
-    handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.');
+    handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.');
     return false;
 }
 
 // Clean the fileName for security reasons
 $fileName = preg_replace('/[^\w\.]+/', '_', $fileName);
-$fileName = preg_replace('/[^' . $valid_chars_regex . '\.]/', '', strtolower(basename($fileName)));
+$fileName = preg_replace('/[^'.$valid_chars_regex.'\.]/', '', strtolower(basename($fileName)));
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     $fileNameA = substr($fileName, 0, strlen($ext));
     $fileNameB = substr($fileName, strlen($ext));
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (!file_exists($targetDir)) {
@@ -277,7 +277,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($file = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -373,7 +373,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -402,7 +402,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -435,13 +435,13 @@ 
     // rename the file
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext
     );
 
     // make thumbnail
     $ret = makeThumbnail(
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext,
         40
     );
 
@@ -452,21 +452,21 @@ 
     }
 
     // get current avatar and delete it
-    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $session->get('user-id'));
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS);
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS);
+    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $session->get('user-id'));
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS);
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS);
 
     // store in DB the new avatar
     DB::query(
-        'UPDATE ' . prefixTable('users') . "
-        SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "'
+        'UPDATE '.prefixTable('users')."
+        SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."'
         WHERE id=%i",
         $session->get('user-id')
     );
 
     // store in session
-    $session->set('user-avatar', $newFileName . '.' . $ext);
-    $session->set('user-avatar_thumb', $newFileName . '_thumb' . '.' . $ext);
+    $session->set('user-avatar', $newFileName.'.'.$ext);
+    $session->set('user-avatar_thumb', $newFileName.'_thumb'.'.'.$ext);
 
     // return info
     echo prepareExchangedData(
@@ -485,7 +485,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB

install--ASUPPRIMER/upgrade_run_3.0.0_users.php

Spacing +85 added lines, -85 removed lines

@@ -81,8 +81,8 @@ 
     );
     $db_link->set_charset(DB_ENCODING);
 } else {
-    $res = 'Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error());
-    echo '[{"finish":"1", "error":"Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error()) . '!"}]';
+    $res = 'Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error());
+    echo '[{"finish":"1", "error":"Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error()).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -107,9 +107,9 @@ 
                 $users = mysqli_query(
                     $db_link,
                     'SELECT id
-                    FROM ' . $pre . 'users
+                    FROM ' . $pre.'users
                     WHERE (public_key = "none" OR public_key = "" OR public_key IS NULL)
-                    AND id NOT IN (' . OTV_USER_ID . ',' . SSH_USER_ID . ',' . API_USER_ID . ')'
+                    AND id NOT IN (' . OTV_USER_ID.','.SSH_USER_ID.','.API_USER_ID.')'
                 );
                 while ($user = mysqli_fetch_array($users)) {
                     array_push($listOfUsers, $user['id']);
@@ -127,11 +127,11 @@ 
             if ((int) $post_tp_user === 0) {
                 // Create TP USER
                 require_once '../includes/config/include.php';
-                $tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "users` WHERE id = '" . TP_USER_ID . "'"));
+                $tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."users` WHERE id = '".TP_USER_ID."'"));
                 if (intval($tmp) === 0) {
                     // generate key for password
                     $pwd = GenerateCryptKey(25, true, true, true, true);
-                    $salt = file_get_contents(SECUREPATH . '/' . SECUREFILE);
+                    $salt = file_get_contents(SECUREPATH.'/'.SECUREFILE);
                     $encrypted_pwd = cryption(
                         $pwd,
                         $salt,
@@ -144,7 +144,7 @@ 
                     // Store
                     $mysqli_result = mysqli_query(
                         $db_link,
-                        "INSERT INTO `" . $pre . "users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `public_key`, `private_key`, `is_ready_for_usage`, `otp_provided`) VALUES ('" . TP_USER_ID . "', 'TP', '".$encrypted_pwd."', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '".$userKeys['public_key']."', '".$userKeys['private_key']."', '1', '1')"
+                        "INSERT INTO `".$pre."users` (`id`, `login`, `pw`, `groupes_visibles`, `derniers`, `key_tempo`, `last_pw_change`, `last_pw`, `admin`, `fonction_id`, `groupes_interdits`, `last_connexion`, `gestionnaire`, `email`, `favourites`, `latest_items`, `personal_folder`, `public_key`, `private_key`, `is_ready_for_usage`, `otp_provided`) VALUES ('".TP_USER_ID."', 'TP', '".$encrypted_pwd."', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0', '".$userKeys['public_key']."', '".$userKeys['private_key']."', '1', '1')"
                     );
                 }
 
@@ -152,7 +152,7 @@ 
                     mysqli_query(
                         $db_link,
                         'SELECT count(*)
-                        FROM ' . $pre . 'sharekeys_items
+                        FROM ' . $pre.'sharekeys_items
                         WHERE user_id = ' . (int) TP_USER_ID
                     )
                 );
@@ -162,7 +162,7 @@ 
                         mysqli_query(
                             $db_link,
                             'SELECT pw, public_key, private_key, name, lastname, login
-                            FROM ' . $pre . 'users
+                            FROM ' . $pre.'users
                             WHERE id = ' . (int) TP_USER_ID
                         )
                     );
@@ -178,7 +178,7 @@ 
                     );
 
                     // Return
-                    echo '[{"finish":"0" , "next":"step1", "error":"" , "data" : "' . base64_encode(json_encode($usersArray)) . '" , "number":"1" , "loop_finished" : "' . (count($listOfUsers) === 0 ? "true" : "false") . '" , "rest" : "' . base64_encode(json_encode($listOfUsers)) . '"}]';
+                    echo '[{"finish":"0" , "next":"step1", "error":"" , "data" : "'.base64_encode(json_encode($usersArray)).'" , "number":"1" , "loop_finished" : "'.(count($listOfUsers) === 0 ? "true" : "false").'" , "rest" : "'.base64_encode(json_encode($listOfUsers)).'"}]';
 
                     exit();
                 }
@@ -191,7 +191,7 @@ 
                     mysqli_query(
                         $db_link,
                         'SELECT pw, public_key, private_key, name, lastname, login
-                        FROM ' . $pre . 'users
+                        FROM ' . $pre.'users
                         WHERE id = ' . (int) $post_number
                     )
                 );
@@ -221,9 +221,9 @@ 
                     // Store
                     mysqli_query(
                         $db_link,
-                        'UPDATE ' . $pre . "users
-                        SET public_key = '" . $userKeys['public_key'] . "',
-                        private_key = '" . $userKeys['private_key'] . "',
+                        'UPDATE '.$pre."users
+                        SET public_key = '" . $userKeys['public_key']."',
+                        private_key = '" . $userKeys['private_key']."',
                         upgrade_needed = 1,
                         special = 'otc_is_required_on_next_login'
                         WHERE id = " . $post_number
@@ -233,31 +233,31 @@ 
                     mysqli_query(
                         $db_link,
                         'DELETE  
-                        FROM ' . $pre . 'sharekeys_items
+                        FROM ' . $pre.'sharekeys_items
                         WHERE user_id = ' . (int) $userInfo['id']
                     );
                     mysqli_query(
                         $db_link,
                         'DELETE  
-                        FROM ' . $pre . 'sharekeys_logs
+                        FROM ' . $pre.'sharekeys_logs
                         WHERE user_id = ' . (int) $userInfo['id']
                     );
                     mysqli_query(
                         $db_link,
                         'DELETE  
-                        FROM ' . $pre . 'sharekeys_fields
+                        FROM ' . $pre.'sharekeys_fields
                         WHERE user_id = ' . (int) $userInfo['id']
                     );
                     mysqli_query(
                         $db_link,
                         'DELETE  
-                        FROM ' . $pre . 'sharekeys_suggestions
+                        FROM ' . $pre.'sharekeys_suggestions
                         WHERE user_id = ' . (int) $userInfo['id']
                     );
                     mysqli_query(
                         $db_link,
                         'DELETE  
-                        FROM ' . $pre . 'sharekeys_files
+                        FROM ' . $pre.'sharekeys_files
                         WHERE user_id = ' . (int) $userInfo['id']
                     );
 
@@ -273,10 +273,10 @@ 
                 }
 
                 // Return
-                echo '[{"finish":"0" , "next":"step1", "error":"" , "data" : "' . base64_encode(json_encode($usersArray)) . '" , "number":"' . ((int) $post_number + 1) . '" , "loop_finished" : "' . (count($listOfUsers) === 0 ? "true" : "false") . '" , "rest" : "' . base64_encode(json_encode($listOfUsers)) . '"}]';
+                echo '[{"finish":"0" , "next":"step1", "error":"" , "data" : "'.base64_encode(json_encode($usersArray)).'" , "number":"'.((int) $post_number + 1).'" , "loop_finished" : "'.(count($listOfUsers) === 0 ? "true" : "false").'" , "rest" : "'.base64_encode(json_encode($listOfUsers)).'"}]';
             } else {
                 // No more user to treat
-                echo '[{"finish":"0" , "next":"step2", "error":"" , "data" : "" , "number":"' . (empty($post_number) === true ? 0 : $post_number) . '" , "loop_finished" : "true" , "rest" : ""}]';
+                echo '[{"finish":"0" , "next":"step2", "error":"" , "data" : "" , "number":"'.(empty($post_number) === true ? 0 : $post_number).'" , "loop_finished" : "true" , "rest" : ""}]';
             }
 
             exit();
@@ -297,7 +297,7 @@ 
 
             if ($userInfo['public_key'] === null) {
                 if ($userInfo['id'] !== TP_USER_ID) {
-                    echo '[{"finish":"1" , "next":"step3", "error":"Public key is null; provided key is '.$post_user_info.'" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "true"}]';
+                    echo '[{"finish":"1" , "next":"step3", "error":"Public key is null; provided key is '.$post_user_info.'" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "true"}]';
                     exit();
                     break;
                 } else {
@@ -306,16 +306,16 @@ 
                         mysqli_query(
                             $db_link,
                             'SELECT pw, public_key, private_key, name, lastname, login
-                            FROM ' . $pre . 'users
+                            FROM ' . $pre.'users
                             WHERE id = ' . TP_USER_ID
                         )
                     );
 
-                    $userInfo['public_key'] ==  $userQuery['public_key'];
-                    $userInfo['private_key'] ==  $userQuery['private_key'];
-                    $userInfo['login'] ==  $userQuery['login'];
-                    $userInfo['name'] ==  $userQuery['name'];
-                    $userInfo['lastname'] ==  $userQuery['lastname'];
+                    $userInfo['public_key'] == $userQuery['public_key'];
+                    $userInfo['private_key'] == $userQuery['private_key'];
+                    $userInfo['login'] == $userQuery['login'];
+                    $userInfo['name'] == $userQuery['name'];
+                    $userInfo['lastname'] == $userQuery['lastname'];
                 }
             }
 
@@ -327,13 +327,13 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT private_key
-                    FROM ' . $pre . 'users
+                    FROM ' . $pre.'users
                     WHERE id = ' . (int) $adminId
                 )
             );
             $adminPrivateKey = decryptPrivateKey($adminPwd, $adminQuery['private_key']);
             if ($adminPrivateKey === false) {
-                echo '[{"finish":"1" , "next":"step3", "error":"Admin PWD is null; provided key is '.$post_admin_info[1].'" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "true"}]';
+                echo '[{"finish":"1" , "next":"step3", "error":"Admin PWD is null; provided key is '.$post_admin_info[1].'" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "true"}]';
                 exit();
                 break;
             }
@@ -343,7 +343,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT count(*)
-                    FROM ' . $pre . 'items
+                    FROM ' . $pre.'items
                     WHERE perso = 0'
                 )
             );
@@ -355,9 +355,9 @@ 
                 $rows = mysqli_query(
                     $db_link,
                     'SELECT id, pw, encryption_type 
-                    FROM ' . $pre . 'items
+                    FROM ' . $pre.'items
                     WHERE perso = 0
-                    LIMIT ' . $post_start . ', ' . $post_count_in_loop
+                    LIMIT ' . $post_start.', '.$post_count_in_loop
                 );
 
                 while ($item = mysqli_fetch_array($rows)) {
@@ -366,8 +366,8 @@ 
                         mysqli_query(
                             $db_link,
                             'SELECT share_key
-                            FROM ' . $pre . 'sharekeys_items
-                            WHERE object_id = ' . (int) $item['id'] . ' AND user_id = ' . (int) $adminId
+                            FROM ' . $pre.'sharekeys_items
+                            WHERE object_id = ' . (int) $item['id'].' AND user_id = '.(int) $adminId
                         )
                     );
 
@@ -381,7 +381,7 @@ 
                                 mysqli_query(
                                     $db_link,
                                     'SELECT public_key
-                                    FROM ' . $pre . 'users
+                                    FROM ' . $pre.'users
                                     WHERE id = ' . (int) $userInfo['id']
                                 )
                             );
@@ -394,15 +394,15 @@ 
                         // Save the key in DB
                         mysqli_query(
                             $db_link,
-                            'INSERT INTO `' . $pre . 'sharekeys_items`(`increment_id`, `object_id`, `user_id`, `share_key`)
-                            VALUES (NULL,' . (int) $item['id'] . ',' . (int) $userInfo['id'] . ",'" . $share_key_for_item . "')"
+                            'INSERT INTO `'.$pre.'sharekeys_items`(`increment_id`, `object_id`, `user_id`, `share_key`)
+                            VALUES (NULL,' . (int) $item['id'].','.(int) $userInfo['id'].",'".$share_key_for_item."')"
                         );
                     }
                 }
 
-                echo '[{"finish":"0" , "next":"step2", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "false"}]';
+                echo '[{"finish":"0" , "next":"step2", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "false"}]';
             } else {
-                echo '[{"finish":"0" , "next":"step3", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "true"}]';
+                echo '[{"finish":"0" , "next":"step3", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "true"}]';
             }
 
             exit();
@@ -429,7 +429,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT private_key
-                    FROM ' . $pre . 'users
+                    FROM ' . $pre.'users
                     WHERE id = ' . (int) $adminId
                 )
             );
@@ -440,7 +440,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT increment_id
-                    FROM ' . $pre . "log_items
+                    FROM ' . $pre."log_items
                     WHERE raison LIKE 'at_pw :%' AND encryption_type = 'teampass_aes'"
                 )
             );
@@ -452,9 +452,9 @@ 
                 $rows = mysqli_query(
                     $db_link,
                     'SELECT increment_id
-                    FROM ' . $pre . "log_items
+                    FROM ' . $pre."log_items
                     WHERE raison LIKE 'at_pw :%' AND encryption_type = 'teampass_aes'
-                    LIMIT " . $post_start . ', ' . $post_count_in_loop
+                    LIMIT " . $post_start.', '.$post_count_in_loop
                 );
 
                 while ($item = mysqli_fetch_array($rows)) {
@@ -463,8 +463,8 @@ 
                         mysqli_query(
                             $db_link,
                             'SELECT share_key
-                            FROM ' . $pre . 'sharekeys_logs
-                            WHERE object_id = ' . (int) $item['id'] . ' AND user_id = ' . (int) $adminId
+                            FROM ' . $pre.'sharekeys_logs
+                            WHERE object_id = ' . (int) $item['id'].' AND user_id = '.(int) $adminId
                         )
                     );
 
@@ -478,15 +478,15 @@ 
                         // Save the key in DB
                         mysqli_query(
                             $db_link,
-                            'INSERT INTO `' . $pre . 'sharekeys_logs`(`increment_id`, `object_id`, `user_id`, `share_key`)
-                            VALUES (NULL,' . (int) $item['id'] . ',' . (int) $userInfo['id'] . ",'" . $share_key_for_item . "')"
+                            'INSERT INTO `'.$pre.'sharekeys_logs`(`increment_id`, `object_id`, `user_id`, `share_key`)
+                            VALUES (NULL,' . (int) $item['id'].','.(int) $userInfo['id'].",'".$share_key_for_item."')"
                         );
                     }
                 }
 
-                echo '[{"finish":"0" , "next":"step3", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "false"}]';
+                echo '[{"finish":"0" , "next":"step3", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "false"}]';
             } else {
-                echo '[{"finish":"0" , "next":"step4", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "true"}]';
+                echo '[{"finish":"0" , "next":"step4", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "true"}]';
             }
 
             exit();
@@ -513,7 +513,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT private_key
-                    FROM ' . $pre . 'users
+                    FROM ' . $pre.'users
                     WHERE id = ' . (int) $adminId
                 )
             );
@@ -524,7 +524,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT id
-                    FROM ' . $pre . 'categories_items'
+                    FROM ' . $pre.'categories_items'
                 )
             );
 
@@ -533,9 +533,9 @@ 
                 $rows = mysqli_query(
                     $db_link,
                     'SELECT id, data, encryption_type
-                    FROM ' . $pre . 'categories_items
-                    WHERE encryption_type = "' . TP_ENCRYPTION_NAME . '"
-                    LIMIT ' . $post_start . ', ' . $post_count_in_loop
+                    FROM ' . $pre.'categories_items
+                    WHERE encryption_type = "' . TP_ENCRYPTION_NAME.'"
+                    LIMIT ' . $post_start.', '.$post_count_in_loop
                 );
 
                 while ($item = mysqli_fetch_array($rows)) {
@@ -544,8 +544,8 @@ 
                         mysqli_query(
                             $db_link,
                             'SELECT share_key
-                            FROM ' . $pre . 'sharekeys_fields
-                            WHERE object_id = ' . (int) $item['id'] . ' AND user_id = ' . (int) $adminId
+                            FROM ' . $pre.'sharekeys_fields
+                            WHERE object_id = ' . (int) $item['id'].' AND user_id = '.(int) $adminId
                         )
                     );
 
@@ -559,15 +559,15 @@ 
                         // Save the key in DB
                         mysqli_query(
                             $db_link,
-                            'INSERT INTO `' . $pre . 'sharekeys_fields`(`increment_id`, `object_id`, `user_id`, `share_key`)
-                            VALUES (NULL,' . (int) $item['id'] . ',' . (int) $userInfo['id'] . ",'" . $share_key_for_item . "')"
+                            'INSERT INTO `'.$pre.'sharekeys_fields`(`increment_id`, `object_id`, `user_id`, `share_key`)
+                            VALUES (NULL,' . (int) $item['id'].','.(int) $userInfo['id'].",'".$share_key_for_item."')"
                         );
                     }
                 }
 
-                echo '[{"finish":"0" , "next":"step4", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "false"}]';
+                echo '[{"finish":"0" , "next":"step4", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "false"}]';
             } else {
-                echo '[{"finish":"0" , "next":"step5", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "true"}]';
+                echo '[{"finish":"0" , "next":"step5", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "true"}]';
             }
 
             exit();
@@ -594,7 +594,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT private_key
-                    FROM ' . $pre . 'users
+                    FROM ' . $pre.'users
                     WHERE id = ' . (int) $adminId
                 )
             );
@@ -605,7 +605,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT id
-                    FROM ' . $pre . 'suggestion'
+                    FROM ' . $pre.'suggestion'
                 )
             );
 
@@ -616,8 +616,8 @@ 
                 $rows = mysqli_query(
                     $db_link,
                     'SELECT id
-                    FROM ' . $pre . 'suggestion
-                    LIMIT ' . $post_start . ', ' . $post_count_in_loop
+                    FROM ' . $pre.'suggestion
+                    LIMIT ' . $post_start.', '.$post_count_in_loop
                 );
 
                 while ($item = mysqli_fetch_array($rows)) {
@@ -626,8 +626,8 @@ 
                         mysqli_query(
                             $db_link,
                             'SELECT share_key
-                            FROM ' . $pre . 'sharekeys_suggestions
-                            WHERE object_id = ' . (int) $item['id'] . ' AND user_id = ' . (int) $adminId
+                            FROM ' . $pre.'sharekeys_suggestions
+                            WHERE object_id = ' . (int) $item['id'].' AND user_id = '.(int) $adminId
                         )
                     );
 
@@ -647,15 +647,15 @@ 
                         // Save the key in DB
                         mysqli_query(
                             $db_link,
-                            'INSERT INTO `' . $pre . 'sharekeys_suggestions`(`increment_id`, `object_id`, `user_id`, `share_key`)
-                            VALUES (NULL,' . (int) $item['id'] . ',' . (int) $userInfo['id'] . ",'" . $share_key_for_item . "')"
+                            'INSERT INTO `'.$pre.'sharekeys_suggestions`(`increment_id`, `object_id`, `user_id`, `share_key`)
+                            VALUES (NULL,' . (int) $item['id'].','.(int) $userInfo['id'].",'".$share_key_for_item."')"
                         );
                     }
                 }
 
-                echo '[{"finish":"0" , "next":"step5", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "false"}]';
+                echo '[{"finish":"0" , "next":"step5", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "false"}]';
             } else {
-                echo '[{"finish":"0" , "next":"step6", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "true"}]';
+                echo '[{"finish":"0" , "next":"step6", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "true"}]';
             }
 
             exit();
@@ -682,7 +682,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT private_key
-                    FROM ' . $pre . 'users
+                    FROM ' . $pre.'users
                     WHERE id = ' . (int) $adminId
                 )
             );
@@ -693,7 +693,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT id
-                    FROM ' . $pre . 'files'
+                    FROM ' . $pre.'files'
                 )
             );
 
@@ -702,9 +702,9 @@ 
                 $rows = mysqli_query(
                     $db_link,
                     'SELECT id
-                    FROM ' . $pre . 'files
-                    WHERE status = "' . TP_ENCRYPTION_NAME . '"
-                    LIMIT ' . $post_start . ', ' . $post_count_in_loop
+                    FROM ' . $pre.'files
+                    WHERE status = "' . TP_ENCRYPTION_NAME.'"
+                    LIMIT ' . $post_start.', '.$post_count_in_loop
                 );
 
                 while ($item = mysqli_fetch_array($rows)) {
@@ -713,8 +713,8 @@ 
                         mysqli_query(
                             $db_link,
                             'SELECT share_key
-                            FROM ' . $pre . 'sharekeys_files
-                            WHERE object_id = ' . (int) $item['id'] . ' AND user_id = ' . (int) $adminId
+                            FROM ' . $pre.'sharekeys_files
+                            WHERE object_id = ' . (int) $item['id'].' AND user_id = '.(int) $adminId
                         )
                     );
 
@@ -734,15 +734,15 @@ 
                         // Save the key in DB
                         mysqli_query(
                             $db_link,
-                            'INSERT INTO `' . $pre . 'sharekeys_files`(`increment_id`, `object_id`, `user_id`, `share_key`)
-                            VALUES (NULL,' . (int) $item['id'] . ',' . (int) $userInfo['id'] . ",'" . $share_key_for_item . "')"
+                            'INSERT INTO `'.$pre.'sharekeys_files`(`increment_id`, `object_id`, `user_id`, `share_key`)
+                            VALUES (NULL,' . (int) $item['id'].','.(int) $userInfo['id'].",'".$share_key_for_item."')"
                         );
                     }
                 }
 
-                echo '[{"finish":"0" , "next":"step6", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "false"}]';
+                echo '[{"finish":"0" , "next":"step6", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "false"}]';
             } else {
-                echo '[{"finish":"0" , "next":"nextUser", "error":"" , "data" : "" , "number":"' . $post_number . '" , "loop_finished" : "true"}]';
+                echo '[{"finish":"0" , "next":"nextUser", "error":"" , "data" : "" , "number":"'.$post_number.'" , "loop_finished" : "true"}]';
             }
 
             exit();
@@ -772,7 +772,7 @@ 
                 mysqli_query(
                     $db_link,
                     'SELECT email, name as userName
-                    FROM ' . $pre . 'users
+                    FROM ' . $pre.'users
                     WHERE id = ' . (int) $userInfo['id']
                 )
             );
@@ -792,7 +792,7 @@ 
                         true
                     );
                 } catch (Exception $e) {
-                    console . log(e);
+                    console.log(e);
                 }
             }
 
@@ -800,4 +800,4 @@ 
     }
 }
 
-echo '[{"finish":"1" , "next":"' . $next . '", "error":""}]';
+echo '[{"finish":"1" , "next":"'.$next.'", "error":""}]';

install--ASUPPRIMER/upgrade_run_3.0.0_passwords.php

Indentation +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
         $database,
         $port
     );
-	$db_link->set_charset(DB_ENCODING);
+    $db_link->set_charset(DB_ENCODING);
 } else {
     $res = 'Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error());
     echo '[{"finish":"1", "error":"Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error()).'!"}]';

install--ASUPPRIMER/upgrade_run_3.1.php

Spacing +7 added lines, -7 removed lines

@@ -68,8 +68,8 @@ 
         $port
     );
 } else {
-    $res = 'Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error());
-    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error()) . '!"}]';
+    $res = 'Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error());
+    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error()).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -85,11 +85,11 @@ 
 
 // 
 // Add new setting 'enable_refresh_task_last_execution'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'enable_refresh_task_last_execution'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'enable_refresh_task_last_execution'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'enable_refresh_task_last_execution', '1')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'enable_refresh_task_last_execution', '1')"
     );
 }
 
@@ -100,7 +100,7 @@ 
 // Add new table ITEMS_OTP
 mysqli_query(
     $db_link,
-    'CREATE TABLE IF NOT EXISTS `' . $pre . 'items_otp` (
+    'CREATE TABLE IF NOT EXISTS `'.$pre.'items_otp` (
     `increment_id` int(12) NOT NULL,
     `item_id` int(12) NOT NULL,
     `secret` text NOT NULL,
@@ -115,14 +115,14 @@ 
 // Alter table TOKENS
 mysqli_query(
     $db_link,
-    'ALTER TABLE `' . $pre . 'tokens` CHANGE `end_timestamp` `end_timestamp` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL;'
+    'ALTER TABLE `'.$pre.'tokens` CHANGE `end_timestamp` `end_timestamp` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL;'
 );
 
 
 // Alter table ldap_groups_roles
 mysqli_query(
     $db_link,
-    'ALTER TABLE `' . $pre . 'ldap_groups_roles` CHANGE `ldap_group_id` `ldap_group_id` VARCHAR(500) NOT NULL;'
+    'ALTER TABLE `'.$pre.'ldap_groups_roles` CHANGE `ldap_group_id` `ldap_group_id` VARCHAR(500) NOT NULL;'
 );
 
 //---<END 3.1.1

install--ASUPPRIMER/upgrade_run_3.0.php

Spacing +96 added lines, -96 removed lines

@@ -70,8 +70,8 @@ 
         $port
     );
 } else {
-    $res = 'Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error());
-    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error()) . '!"}]';
+    $res = 'Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error());
+    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error()).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -101,12 +101,12 @@ 
 
 // Add the INDEX process_id_idx to the processes_tasks table
 $res = checkIndexExist(
-    $pre . 'processes_tasks',
+    $pre.'processes_tasks',
     'process_id_idx',
     "ADD KEY `process_id_idx` (`process_id`)"
 );
 if (!$res) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX process_id_idx to the processes_tasks table! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding the INDEX process_id_idx to the processes_tasks table! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -117,38 +117,38 @@ 
 
 //--->BEGIN 3.0.6
 // Add new setting 'sending_emails_job_frequency'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'sending_emails_job_frequency'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'sending_emails_job_frequency'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'sending_emails_job_frequency', '2')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'sending_emails_job_frequency', '2')"
     );
 }
 // Add new setting 'user_keys_job_frequency'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'user_keys_job_frequency'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'user_keys_job_frequency'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'user_keys_job_frequency', '1')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'user_keys_job_frequency', '1')"
     );
 }
 // Add new setting 'items_statistics_job_frequency'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'enable_tasks_items_statistics_job_frequencymanager'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'enable_tasks_items_statistics_job_frequencymanager'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'items_statistics_job_frequency', '5')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'items_statistics_job_frequency', '5')"
     );
 }
 
 // Add field ongoing_process_id to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'ongoing_process_id',
     "varchar(100) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field ongoing_process_id to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field ongoing_process_id to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -161,7 +161,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'cache_tree` CHANGE `data` `data` LONGTEXT DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'cache_tree` CHANGE `data` `data` LONGTEXT DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -170,7 +170,7 @@ 
 // Fix for #3679
 mysqli_query(
     $db_link,
-    "UPDATE `" . $pre . "users` SET `treeloadstrategy` = 'full' WHERE treeloadstrategy NOT IN ('full','sequential');"
+    "UPDATE `".$pre."users` SET `treeloadstrategy` = 'full' WHERE treeloadstrategy NOT IN ('full','sequential');"
 );
 
 //---<END 3.0.7
@@ -180,12 +180,12 @@ 
 //--->BEGIN 3.0.8
 // Add field mfa_disabled to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'mfa_enabled',
     "tinyint(1) NOT null DEFAULT '1';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field mfa_disabled to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field mfa_disabled to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -196,124 +196,124 @@ 
 
 //--->BEGIN 3.0.9
 // Add new setting 'reload_cache_table_task'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'reload_cache_table_task'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'reload_cache_table_task'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'reload_cache_table_task', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'reload_cache_table_task', '')"
     );
 }
 // Add new setting 'rebuild_config_file'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'rebuild_config_file'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'rebuild_config_file'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'rebuild_config_file', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'rebuild_config_file', '')"
     );
 }// Add new setting 'purge_temporary_files_task'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'purge_temporary_files_task'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'purge_temporary_files_task'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'purge_temporary_files_task', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'purge_temporary_files_task', '')"
     );
 }
 // Add new setting 'clean_orphan_objects_task'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'clean_orphan_objects_task'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'clean_orphan_objects_task'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'clean_orphan_objects_task', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'clean_orphan_objects_task', '')"
     );
 }
 // Add new setting 'users_personal_folder_task'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'users_personal_folder_task'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'users_personal_folder_task'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'users_personal_folder_task', '')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'users_personal_folder_task', '')"
     );
 }
 
 // Remove unused settings
 mysqli_query(
     $db_link,
-    "DELETE FROM `" . $pre . "misc` WHERE `intitule`='maintenance_job_tasks';"
+    "DELETE FROM `".$pre."misc` WHERE `intitule`='maintenance_job_tasks';"
 );
 mysqli_query(
     $db_link,
-    "DELETE FROM `" . $pre . "misc` WHERE `intitule`='maintenance_job_frequency';"
+    "DELETE FROM `".$pre."misc` WHERE `intitule`='maintenance_job_frequency';"
 );
 
 // Add field item_key to ITEMS table
 $res = addColumnIfNotExist(
-    $pre . 'items',
+    $pre.'items',
     'item_key',
     "varchar(500) NOT NULL DEFAULT '-1';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field item_key to table ITEMS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field item_key to table ITEMS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Remove column unique from ITEMS table
 $res = removeColumnIfNotExist(
-    $pre . 'items',
+    $pre.'items',
     'unique'
 );
 
 // Add field export_tag to EXPORT table
 $res = addColumnIfNotExist(
-    $pre . 'export',
+    $pre.'export',
     'export_tag',
     "varchar(20) NOT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field export_tag to table EXPORT! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field export_tag to table EXPORT! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field folder_id to EXPORT table
 $res = addColumnIfNotExist(
-    $pre . 'export',
+    $pre.'export',
     'folder_id',
     "varchar(10) NOT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field folder_id to table EXPORT! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field folder_id to table EXPORT! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field perso to EXPORT table
 $res = addColumnIfNotExist(
-    $pre . 'export',
+    $pre.'export',
     'perso',
     "tinyint(1) NOT NULL default '0';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field perso to table EXPORT! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field perso to table EXPORT! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field restricted_to to EXPORT table
 $res = addColumnIfNotExist(
-    $pre . 'export',
+    $pre.'export',
     'restricted_to',
     "varchar(200) DEFAULT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field restricted_to to table EXPORT! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field restricted_to to table EXPORT! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Rename column id to item_id in EXPORT table
 changeColumnName(
-    $pre . 'export',
+    $pre.'export',
     'id',
     'item_id',
     "int(12) NOT NULL"
@@ -321,42 +321,42 @@ 
 
 // Add field created_at to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'created_at',
     "varchar(30) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field created_at to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field created_at to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field updated_at to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'updated_at',
     "varchar(30) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field updated_at to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field updated_at to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field deleted_at to USERS table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'deleted_at',
     "varchar(30) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field deleted_at to table USERS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field deleted_at to table USERS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // populate created_at, updated_at and deleted_at fields in USERS table
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "users` WHERE created_at IS NOT NULL"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."users` WHERE created_at IS NOT NULL"));
 if (intval($tmp) === 0) {
     populateUsersTable($pre);
 }
@@ -368,36 +368,36 @@ 
 
 // Add field created_at to ITEMS table
 $res = addColumnIfNotExist(
-    $pre . 'items',
+    $pre.'items',
     'created_at',
     "varchar(30) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field created_at to table ITEMS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field created_at to table ITEMS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field updated_at to ITEMS table
 $res = addColumnIfNotExist(
-    $pre . 'items',
+    $pre.'items',
     'updated_at',
     "varchar(30) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field updated_at to table ITEMS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field updated_at to table ITEMS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field deleted_at to ITEMS table
 $res = addColumnIfNotExist(
-    $pre . 'items',
+    $pre.'items',
     'deleted_at',
     "varchar(30) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field deleted_at to table ITEMS! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field deleted_at to table ITEMS! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -406,29 +406,29 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'processes` CHANGE `process_type` `process_type` VARCHAR(100) NOT NULL;'
+        'ALTER TABLE `'.$pre.'processes` CHANGE `process_type` `process_type` VARCHAR(100) NOT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
 }
 
 // Add new setting 'maximum_session_expiration_time'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'maximum_session_expiration_time'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'maximum_session_expiration_time'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'maximum_session_expiration_time', '60')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'maximum_session_expiration_time', '60')"
     );
 }
 
 // Add field treated_objects to processes_logs table
 $res = addColumnIfNotExist(
-    $pre . 'processes_logs',
+    $pre.'processes_logs',
     'treated_objects',
     "varchar(20) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field treated_objects to table processes_logs! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field treated_objects to table processes_logs! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -437,7 +437,7 @@ 
 $resAdmin = mysqli_query(
     $db_link,
     "select name, lastname
-    from `" . $pre . "users`
+    from `" . $pre."users`
     WHERE id = 1"
 );
 $admin = mysqli_fetch_array($resAdmin);
@@ -445,54 +445,54 @@ 
     // update created_at field
     mysqli_query(
         $db_link,
-        "UPDATE `" . $pre . "users` SET name = 'Change me', lastname = 'Change me' WHERE id = 1"
+        "UPDATE `".$pre."users` SET name = 'Change me', lastname = 'Change me' WHERE id = 1"
     );
 }
 
 // Add field started_at to processes table
 $res = addColumnIfNotExist(
-    $pre . 'processes',
+    $pre.'processes',
     'started_at',
     "varchar(50) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field started_at to table processes! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field started_at to table processes! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field views to otv table
 $res = addColumnIfNotExist(
-    $pre . 'otv',
+    $pre.'otv',
     'views',
     "INT(10) NOT NULL DEFAULT '0';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field views to table otv! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field views to table otv! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field max_views to otv table
 $res = addColumnIfNotExist(
-    $pre . 'otv',
+    $pre.'otv',
     'max_views',
     "INT(10) NULL DEFAULT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field max_views to table otv! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field max_views to table otv! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field time_limit to otv table
 $res = addColumnIfNotExist(
-    $pre . 'otv',
+    $pre.'otv',
     'time_limit',
     "varchar(100) DEFAULT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field time_limit to table otv! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field time_limit to table otv! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -500,14 +500,14 @@ 
 // delete old otv
 mysqli_query(
     $db_link,
-    "DELETE FROM `" . $pre . "otv` WHERE max_views IS NULL;"
+    "DELETE FROM `".$pre."otv` WHERE max_views IS NULL;"
 );
 
 // Alter encrypted_psk in Users
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'users` CHANGE `encrypted_psk` `encrypted_psk` text NULL DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'users` CHANGE `encrypted_psk` `encrypted_psk` text NULL DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -517,7 +517,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'items` CHANGE `url` `url` TEXT NULL DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'items` CHANGE `url` `url` TEXT NULL DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -527,7 +527,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'cache` CHANGE `url` `url` TEXT NULL DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'cache` CHANGE `url` `url` TEXT NULL DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -535,12 +535,12 @@ 
 
 // Add field item_id to processes table
 $res = addColumnIfNotExist(
-    $pre . 'processes',
+    $pre.'processes',
     'item_id',
     "INT(12) NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field item_id to table processes! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field item_id to table processes! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -549,18 +549,18 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'users` CHANGE `login` `login` VARCHAR(500) NOT NULL;'
+        'ALTER TABLE `'.$pre.'users` CHANGE `login` `login` VARCHAR(500) NOT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
 }
 
 // Add new setting 'items_ops_job_frequency'
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'items_ops_job_frequency'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'items_ops_job_frequency'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'items_ops_job_frequency', '1')"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'items_ops_job_frequency', '1')"
     );
 }
 
@@ -568,7 +568,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'log_items` CHANGE `raison_iv` `old_value` MEDIUMTEXT NULL DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'log_items` CHANGE `raison_iv` `old_value` MEDIUMTEXT NULL DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -578,7 +578,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'cache` CHANGE `description` `description` MEDIUMTEXT NULL DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'cache` CHANGE `description` `description` MEDIUMTEXT NULL DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -586,24 +586,24 @@ 
 
 // Add field shared_globaly to otv table
 $res = addColumnIfNotExist(
-    $pre . 'otv',
+    $pre.'otv',
     'shared_globaly',
     "INT(1) NOT NULL DEFAULT '0';"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field shared_globaly to table otv! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field shared_globaly to table otv! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
 // Add field keys_recovery_time to users table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'keys_recovery_time',
     "VARCHAR(500) NULL DEFAULT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field keys_recovery_time to table users! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field keys_recovery_time to table users! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -612,7 +612,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'users` CHANGE `favourites` `favourites` varchar(1000) NULL DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'users` CHANGE `favourites` `favourites` varchar(1000) NULL DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -620,12 +620,12 @@ 
 
 // Add field aes_iv to users table
 $res = addColumnIfNotExist(
-    $pre . 'users',
+    $pre.'users',
     'aes_iv',
     "TEXT NULL DEFAULT NULL;"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field aes_iv to table users! ' . mysqli_error($db_link) . '!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field aes_iv to table users! '.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -634,7 +634,7 @@ 
 try {
     mysqli_query(
         $db_link,
-        'ALTER TABLE `' . $pre . 'users` CHANGE `psk` `psk` VARCHAR(400) NULL DEFAULT NULL;'
+        'ALTER TABLE `'.$pre.'users` CHANGE `psk` `psk` VARCHAR(400) NULL DEFAULT NULL;'
     );
 } catch (Exception $e) {
     // Do nothing
@@ -642,7 +642,7 @@ 
 
 // Now removing all old libraries
 deleteAll([
-    "Illuminate","Encryption","Tightenco","portable-ascii-master","Pdf","ForceUTF8","portable-utf8-master","GO","Symfony","Elegant","Firebase","Database","anti-xss-master","LdapRecord","misc","PasswordGenerator","Authentication","Goodby","Plupload","PHPMailer","TiBeN","protect","Cron","PasswordLib","Fork","Carbon","Tree","Webmozart"
+    "Illuminate", "Encryption", "Tightenco", "portable-ascii-master", "Pdf", "ForceUTF8", "portable-utf8-master", "GO", "Symfony", "Elegant", "Firebase", "Database", "anti-xss-master", "LdapRecord", "misc", "PasswordGenerator", "Authentication", "Goodby", "Plupload", "PHPMailer", "TiBeN", "protect", "Cron", "PasswordLib", "Fork", "Carbon", "Tree", "Webmozart"
 ]);
 
 //---<END 3.0.10
@@ -650,16 +650,16 @@ 
 //---------------------------------------------------------------------
 
 // Save timestamp
-$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `" . $pre . "misc` WHERE type = 'admin' AND intitule = 'upgrade_timestamp'"));
+$tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'upgrade_timestamp'"));
 if (intval($tmp) === 0) {
     mysqli_query(
         $db_link,
-        "INSERT INTO `" . $pre . "misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'upgrade_timestamp', ".time().")"
+        "INSERT INTO `".$pre."misc` (`type`, `intitule`, `valeur`) VALUES ('admin', 'upgrade_timestamp', ".time().")"
     );
 } else {
     mysqli_query(
         $db_link,
-        "UPDATE `" . $pre . "misc` SET valeur = ".time()." WHERE type = 'admin' AND intitule = 'upgrade_timestamp'"
+        "UPDATE `".$pre."misc` SET valeur = ".time()." WHERE type = 'admin' AND intitule = 'upgrade_timestamp'"
     );
 }
 
@@ -681,8 +681,8 @@ 
     $users = mysqli_query(
         $db_link,
         "select u.id as uid, ls.date as datetime
-        from `" . $pre . "users` as u
-        inner join `" . $pre . "log_system` as ls on ls.field_1 = u.id
+        from `" . $pre."users` as u
+        inner join `" . $pre."log_system` as ls on ls.field_1 = u.id
         WHERE ls.type = 'user_mngt' AND ls.label = 'at_user_added'"
     );
     while ($user = mysqli_fetch_assoc($users)) {
@@ -690,7 +690,7 @@ 
             // update created_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "users` SET created_at = '".$user['datetime']."' WHERE id = ".$user['uid']
+                "UPDATE `".$pre."users` SET created_at = '".$user['datetime']."' WHERE id = ".$user['uid']
             );
         }
     }
@@ -698,14 +698,14 @@ 
     // loop on users - updated_at
     $users = mysqli_query(
         $db_link,
-        "select u.id as uid, (select date from " . $pre . "log_system where type = 'user_mngt' and field_1=uid order by date DESC limit 1) as datetime from `" . $pre . "users` as u;"
+        "select u.id as uid, (select date from ".$pre."log_system where type = 'user_mngt' and field_1=uid order by date DESC limit 1) as datetime from `".$pre."users` as u;"
     );
     while ($user = mysqli_fetch_assoc($users)) {
         if (empty((string) $user['datetime']) === false && is_null($user['datetime']) === false) {
             // update updated_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "users` SET updated_at = '".$user['datetime']."' WHERE id = ".$user['uid']
+                "UPDATE `".$pre."users` SET updated_at = '".$user['datetime']."' WHERE id = ".$user['uid']
             );
         }
     }

install--ASUPPRIMER/libs/SecureHandler.php

Spacing +8 added lines, -8 removed lines

@@ -25,13 +25,13 @@ 
      */
     public function __construct()
     {
-        if (! extension_loaded('openssl')) {
+        if (!extension_loaded('openssl')) {
             throw new \RuntimeException(sprintf(
                 "You need the OpenSSL extension to use %s",
                 __CLASS__
             ));
         }
-        if (! extension_loaded('mbstring')) {
+        if (!extension_loaded('mbstring')) {
             throw new \RuntimeException(sprintf(
                 "You need the Multibytes extension to use %s",
                 __CLASS__
@@ -47,7 +47,7 @@ 
      */
     public function open($save_path, $session_name): bool
     {
-        $this->key = $this->getKey('KEY_' . $session_name);
+        $this->key = $this->getKey('KEY_'.$session_name);
         return parent::open($save_path, $session_name);
     }
 
@@ -94,11 +94,11 @@ 
         // Authentication
         $hmac = hash_hmac(
             'SHA256',
-            $iv . $ciphertext,
+            $iv.$ciphertext,
             mb_substr($key, 32, null, '8bit'),
             true
         );
-        return $hmac . $iv . $ciphertext;
+        return $hmac.$iv.$ciphertext;
     }
 
     /**
@@ -116,11 +116,11 @@ 
         // Authentication
         $hmacNew = hash_hmac(
             'SHA256',
-            $iv . $ciphertext,
+            $iv.$ciphertext,
             mb_substr($key, 32, null, '8bit'),
             true
         );
-        if (! hash_equals($hmac, $hmacNew)) {
+        if (!hash_equals($hmac, $hmacNew)) {
             throw new Exception\AuthenticationFailedException('Authentication failed');
         }
         // Decrypt
@@ -148,7 +148,7 @@ 
             // if session cookie lifetime > 0 then add to current time
             // otherwise leave it as zero, honoring zero's special meaning
             // expire at browser close.
-            $arr_cookie_options = array (
+            $arr_cookie_options = array(
                 'expires' => ($cookieParam['lifetime'] > 0) ? time() + $cookieParam['lifetime'] : 0,
                 'path' => '/',
                 'secure' => true,

install--ASUPPRIMER/upgrade_ajax.php

Indentation +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
 
 // Do we need to rewrite the settings.php file?
 if (defined("DB_PASSWD") === false) {
-	$settingsFile = '../includes/config/settings.php';
+    $settingsFile = '../includes/config/settings.php';
     if (null !== SECUREPATH) { //3.0.0.23
         //Do a copy of the existing file
         if (!copy(
@@ -191,17 +191,17 @@ 
 define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH) . '");';
 define("SECUREFILE", "' . SECUREFILE. '");
 
-		if (defined('IKEY') === true) $settingsTxt .= '
+        if (defined('IKEY') === true) $settingsTxt .= '
 define("IKEY", "' . IKEY . '");';
-		else $settingsTxt .= '
+        else $settingsTxt .= '
 define("IKEY", "");';
-		if (defined('SKEY') === true) $settingsTxt .= '
+        if (defined('SKEY') === true) $settingsTxt .= '
 define("SKEY", "' . SKEY . '");';
-		else $settingsTxt .= '
+        else $settingsTxt .= '
 define("SKEY", "");';
-		if (defined('HOST') === true) $settingsTxt .= '
+        if (defined('HOST') === true) $settingsTxt .= '
 define("HOST", "' . HOST . '");';
-		else $settingsTxt .= '
+        else $settingsTxt .= '
 define("HOST", "");';
 
 

Spacing +143 added lines, -143 removed lines

@@ -71,7 +71,7 @@ 
         //Do a copy of the existing file
         if (!copy(
             $settingsFile,
-            $settingsFile . '.' . date(
+            $settingsFile.'.'.date(
                 'Y_m_d_H_i_s',
                 mktime((int) date('H'), (int) date('i'), (int) date('s'), (int) date('m'), (int) date('d'), (int) date('y'))
             )
@@ -88,7 +88,7 @@ 
         // CHeck if old sk.php exists.
         // If yes then get keys to database and delete it
         if (empty($post_sk_path) === false || defined('SECUREPATH') === true) {
-            $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH) . '/sk.php';
+            $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH).'/sk.php';
             if (file_exists($filename)) {
                 include_once $filename;
                 unlink($filename);
@@ -97,63 +97,63 @@ 
                 // SKEY
                 $tmp = mysqli_query(
                     $db_link,
-                    "SELECT INTO `" . $pre . "misc`
+                    "SELECT INTO `".$pre."misc`
                     WHERE type = 'admin' AND intitule = 'duo_skey'"
                 );
                 if ($tmp) {
                     mysqli_query(
                         $db_link,
-                        "UPDATE `" . $pre . "misc`
-                        set valeur = '" . SKEY . "', type = 'admin', intitule = 'duo_skey'"
+                        "UPDATE `".$pre."misc`
+                        set valeur = '" . SKEY."', type = 'admin', intitule = 'duo_skey'"
                     );
                 } else {
                     mysqli_query(
                         $db_link,
-                        "INSERT INTO `" . $pre . "misc`
+                        "INSERT INTO `".$pre."misc`
                         (`valeur`, `type`, `intitule`)
-                        VALUES ('" . SKEY . "', 'admin', 'duo_skey')"
+                        VALUES ('" . SKEY."', 'admin', 'duo_skey')"
                     );
                 }
 
                 // IKEY
                 $tmp = mysqli_query(
                     $db_link,
-                    "SELECT INTO `" . $pre . "misc`
+                    "SELECT INTO `".$pre."misc`
                     WHERE type = 'admin' AND intitule = 'duo_ikey'"
                 );
                 if ($tmp) {
                     mysqli_query(
                         $db_link,
-                        "UPDATE `" . $pre . "misc`
-                        set valeur = '" . IKEY . "', type = 'admin', intitule = 'duo_ikey'"
+                        "UPDATE `".$pre."misc`
+                        set valeur = '" . IKEY."', type = 'admin', intitule = 'duo_ikey'"
                     );
                 } else {
                     mysqli_query(
                         $db_link,
-                        "INSERT INTO `" . $pre . "misc`
+                        "INSERT INTO `".$pre."misc`
                         (`valeur`, `type`, `intitule`)
-                        VALUES ('" . IKEY . "', 'admin', 'duo_ikey')"
+                        VALUES ('" . IKEY."', 'admin', 'duo_ikey')"
                     );
                 }
 
                 // HOST
                 $tmp = mysqli_query(
                     $db_link,
-                    "SELECT INTO `" . $pre . "misc`
+                    "SELECT INTO `".$pre."misc`
                     WHERE type = 'admin' AND intitule = 'duo_host'"
                 );
                 if ($tmp) {
                     mysqli_query(
                         $db_link,
-                        "UPDATE `" . $pre . "misc`
-                        set valeur = '" . HOST . "', type = 'admin', intitule = 'duo_host'"
+                        "UPDATE `".$pre."misc`
+                        set valeur = '" . HOST."', type = 'admin', intitule = 'duo_host'"
                     );
                 } else {
                     mysqli_query(
                         $db_link,
-                        "INSERT INTO `" . $pre . "misc`
+                        "INSERT INTO `".$pre."misc`
                         (`valeur`, `type`, `intitule`)
-                        VALUES ('" . HOST . "', 'admin', 'duo_host')"
+                        VALUES ('" . HOST."', 'admin', 'duo_host')"
                     );
                 }
             }
@@ -169,13 +169,13 @@ 
         
         $settingsTxt = '<?php
 // DATABASE connexion parameters
-define("DB_HOST", "' . $server . '");
-define("DB_USER", "' . $user . '");
-define("DB_PASSWD", "' . $pass . '");
-define("DB_NAME", "' . $database . '");
-define("DB_PREFIX", "' . $pre . '");
-define("DB_PORT", "' . $port . '");
-define("DB_ENCODING", "' . $encoding . '");
+define("DB_HOST", "' . $server.'");
+define("DB_USER", "' . $user.'");
+define("DB_PASSWD", "' . $pass.'");
+define("DB_NAME", "' . $database.'");
+define("DB_PREFIX", "' . $pre.'");
+define("DB_PORT", "' . $port.'");
+define("DB_ENCODING", "' . $encoding.'");
 define("DB_SSL", false); // if DB over SSL then comment this line
 // if DB over SSL then uncomment the following lines
 //define("DB_SSL", array(
@@ -188,19 +188,19 @@ 
 define("DB_CONNECT_OPTIONS", array(
     MYSQLI_OPT_CONNECT_TIMEOUT => 10
 ));
-define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH) . '");';
+define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH).'");';
 define("SECUREFILE", "' . SECUREFILE. '");
 
 		if (defined('IKEY') === true) $settingsTxt .= '
-define("IKEY", "' . IKEY . '");';
+define("IKEY", "' . IKEY.'");';
 		else $settingsTxt .= '
 define("IKEY", "");';
 		if (defined('SKEY') === true) $settingsTxt .= '
-define("SKEY", "' . SKEY . '");';
+define("SKEY", "' . SKEY.'");';
 		else $settingsTxt .= '
 define("SKEY", "");';
 		if (defined('HOST') === true) $settingsTxt .= '
-define("HOST", "' . HOST . '");';
+define("HOST", "' . HOST.'");';
 		else $settingsTxt .= '
 define("HOST", "");';
 
@@ -296,7 +296,7 @@ 
                     '}]';
                     break;
                 }
-                if (!file_exists(SECUREPATH . '/sk.php')) {
+                if (!file_exists(SECUREPATH.'/sk.php')) {
                     echo '[{'.
                         '"error" : "Error in settings.php file!<br>Check correctness of path indicated in file `includes/config/settings.php`.<br>Reload this page and retry.",'.
                         '"index" : ""'.
@@ -312,8 +312,8 @@ 
             $user_info = mysqli_fetch_array(
                 mysqli_query(
                     $db_link,
-                    'SELECT id, pw, admin FROM ' . $pre . "users
-                    WHERE login='" . mysqli_escape_string($db_link, stripslashes($post_login)) . "'"
+                    'SELECT id, pw, admin FROM '.$pre."users
+                    WHERE login='" . mysqli_escape_string($db_link, stripslashes($post_login))."'"
                 )
             );
 
@@ -332,9 +332,9 @@ 
                     echo '[{'.
                         '"error" : "",'.
                         '"index" : 1,'.
-                        '"info" : "' . base64_encode(json_encode(
+                        '"info" : "'.base64_encode(json_encode(
                             array(mysqli_escape_string($db_link, stripslashes($post_login)), $post_pwd, $user_info['id'])
-                        )) . '"'.
+                        )).'"'.
                     '}]';
                 } else {
                     $superGlobal->put('user_granted', false, 'SESSION');
@@ -367,14 +367,14 @@ 
             $txt = '';
             $var_x = 1;
             $tab = array(
-                $abspath . '/includes/config/settings.php',
-                $abspath . '/includes/libraries/csrfp/libs/',
-                $abspath . '/install/',
-                $abspath . '/includes/',
-                $abspath . '/includes/config/',
-                $abspath . '/includes/avatars/',
-                $abspath . '/files/',
-                $abspath . '/upload/',
+                $abspath.'/includes/config/settings.php',
+                $abspath.'/includes/libraries/csrfp/libs/',
+                $abspath.'/install/',
+                $abspath.'/includes/',
+                $abspath.'/includes/config/',
+                $abspath.'/includes/avatars/',
+                $abspath.'/files/',
+                $abspath.'/upload/',
             );
             foreach ($tab as $elem) {
                 // try to create it if not existing
@@ -383,11 +383,11 @@ 
                 }
                 // check if writable
                 if (is_writable($elem)) {
-                    $txt .= '<span>' .
-                        $elem . '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
+                    $txt .= '<span>'.
+                        $elem.'<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
                 } else {
-                    $txt .= '<span>' .
-                        $elem . '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
+                    $txt .= '<span>'.
+                        $elem.'<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
                     $okWritable = false;
                 }
                 ++$var_x;
@@ -395,105 +395,105 @@ 
 
             if (!extension_loaded('openssl')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"openssl\"' .
+                $txt .= '<span>PHP extension \"openssl\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"openssl\"' .
+                $txt .= '<span>PHP extension \"openssl\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('gd')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"gd\"' .
+                $txt .= '<span>PHP extension \"gd\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"gd\"' .
+                $txt .= '<span>PHP extension \"gd\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('mbstring')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"mbstring\"' .
+                $txt .= '<span>PHP extension \"mbstring\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"mbstring\"' .
+                $txt .= '<span>PHP extension \"mbstring\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('bcmath')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"bcmath\"' .
+                $txt .= '<span>PHP extension \"bcmath\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"bcmath\"' .
+                $txt .= '<span>PHP extension \"bcmath\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('iconv')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"iconv\"' .
+                $txt .= '<span>PHP extension \"iconv\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"iconv\"' .
+                $txt .= '<span>PHP extension \"iconv\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('xml')) {
                 //$okExtensions = false;
-                $txt .= '<span>PHP extension \"xml\"' .
+                $txt .= '<span>PHP extension \"xml\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"xml\"' .
+                $txt .= '<span>PHP extension \"xml\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('curl')) {
-                $txt .= '<span>PHP extension \"curl\"' .
+                $txt .= '<span>PHP extension \"curl\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"curl\"' .
+                $txt .= '<span>PHP extension \"curl\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (!extension_loaded('gmp')) {
-                $txt .= '<span>PHP extension \"gmp\"' .
+                $txt .= '<span>PHP extension \"gmp\"'.
                     '<i class=\"fa-solid fa-circle-minus text-danger ml-2\"></i></span><br />';
             } else {
-                $txt .= '<span>PHP extension \"gmp\"' .
+                $txt .= '<span>PHP extension \"gmp\"'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (ini_get('max_execution_time') < 30) {
-                $txt .= '<span>PHP \"Maximum ' .
-                    'execution time\" is set to ' . ini_get('max_execution_time') . ' seconds.' .
-                    ' Please try to set to 60s at least until Upgrade is finished.&nbsp;' .
+                $txt .= '<span>PHP \"Maximum '.
+                    'execution time\" is set to '.ini_get('max_execution_time').' seconds.'.
+                    ' Please try to set to 60s at least until Upgrade is finished.&nbsp;'.
                     '&nbsp;<img src=\"images/minus-circle.png\"></span> <br />';
             } else {
-                $txt .= '<span>PHP \"Maximum ' .
-                    'execution time\" is set to ' . ini_get('max_execution_time') . ' seconds' .
+                $txt .= '<span>PHP \"Maximum '.
+                    'execution time\" is set to '.ini_get('max_execution_time').' seconds'.
                     '<i class=\"fa-solid fa-circle-check text-success ml-2\"></i></span><br />';
             }
             if (version_compare(phpversion(), MIN_PHP_VERSION, '<')) {
-                $txt .= '<span>PHP version ' .
-                    phpversion() . ' is not OK (minimum is '.MIN_PHP_VERSION.') &nbsp;&nbsp;' .
+                $txt .= '<span>PHP version '.
+                    phpversion().' is not OK (minimum is '.MIN_PHP_VERSION.') &nbsp;&nbsp;'.
                     '<img src=\"images/minus-circle.png\"></span><br />';
             } else {
-                $txt .= '<span>PHP version ' .
-                    phpversion() . ' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                $txt .= '<span>PHP version '.
+                    phpversion().' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                     '</span><br />';
             }
-            $mysqlVersion = version_compare($db_link -> server_version, MIN_MYSQL_VERSION, '<') ;
-            $mariadbVersion = version_compare($db_link -> server_version, MIN_MARIADB_VERSION, '<') ;
+            $mysqlVersion = version_compare($db_link -> server_version, MIN_MYSQL_VERSION, '<');
+            $mariadbVersion = version_compare($db_link -> server_version, MIN_MARIADB_VERSION, '<');
             if ($mysqlVersion && $mariadbVersion) {
                 if ($mariadbVersion === '') {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_version . ' is not OK (minimum is '.MIN_MYSQL_VERSION.') &nbsp;&nbsp;' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_version.' is not OK (minimum is '.MIN_MYSQL_VERSION.') &nbsp;&nbsp;'.
                         '<img src=\"images/minus-circle.png\"></span><br />';
                 } else {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_version . ' is not OK (minimum is '.MIN_MARIADB_VERSION.') &nbsp;&nbsp;' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_version.' is not OK (minimum is '.MIN_MARIADB_VERSION.') &nbsp;&nbsp;'.
                         '<img src=\"images/minus-circle.png\"></span><br />';
                 }
             } else {
                 if ($mariadbVersion === '') {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_info . ' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_info.' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 } else {
-                    $txt .= '<span>MySQL version ' .
-                        $db_link -> server_info . ' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>MySQL version '.
+                        $db_link -> server_info.' is OK<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 }
                 
@@ -503,22 +503,22 @@ 
             // check if 2.1.27 already installed
             if (defined(SECUREPATH) === true) {
                 $okEncryptKey = false;
-                $defuse_file = SECUREPATH . '/teampass-seckey.txt';
+                $defuse_file = SECUREPATH.'/teampass-seckey.txt';
                 if (file_exists($defuse_file)) {
                     $okEncryptKey = true;
                     $superGlobal->put('tp_defuse_installed', true, 'SESSION');
-                    $txt .= '<span>Defuse encryption key is defined<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>Defuse encryption key is defined<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 }
 
                 if ($okEncryptKey === false) {
                     $superGlobal->put('tp_defuse_installed', false, 'SESSION');
-                    $txt .= '<span>Encryption Key (SALT) ' .
-                        ' could not be recovered from ' . $defuse_file . '&nbsp;&nbsp;' .
+                    $txt .= '<span>Encryption Key (SALT) '.
+                        ' could not be recovered from '.$defuse_file.'&nbsp;&nbsp;'.
                         '<img src=\"images/minus-circle.png\"></span><br />';
                 } else {
                     $okEncryptKey = true;
-                    $txt .= '<span>Encryption Key (SALT) is available<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>' .
+                    $txt .= '<span>Encryption Key (SALT) is available<i class=\"fa-solid fa-circle-check text-success ml-2\"></i>'.
                         '</span><br />';
                 }
             } else {
@@ -534,10 +534,10 @@ 
             }
 
             echo '[{'.
-                '"error" : "' . $error . '",'.
-                '"info" : "' . $txt . '",'.
+                '"error" : "'.$error.'",'.
+                '"info" : "'.$txt.'",'.
                 '"index" : "'.($error === "" ? "" : $nextStep).'",'.
-                '"infos" : "' . $okWritable." ; ".$okExtensions." ; ".$okEncryptKey." ; " . '"'.
+                '"infos" : "'.$okWritable." ; ".$okExtensions." ; ".$okEncryptKey." ; ".'"'.
             '}]';
             break;
 
@@ -562,14 +562,14 @@ 
             if (@mysqli_fetch_row(
                 mysqli_query(
                     $db_link,
-                    'SELECT valeur FROM ' . $pre . "misc
+                    'SELECT valeur FROM '.$pre."misc
                     WHERE type='admin' AND intitule = 'utf8_enabled'"
                 )
             )) {
                 $cpmIsUTF8 = mysqli_fetch_row(
                     mysqli_query(
                         $db_link,
-                        'SELECT valeur FROM ' . $pre . "misc
+                        'SELECT valeur FROM '.$pre."misc
                         WHERE type='admin' AND intitule = 'utf8_enabled'"
                     )
                 );
@@ -579,9 +579,9 @@ 
             // put TP in maintenance mode or not
             @mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "misc`
+                "UPDATE `".$pre."misc`
                 SET `valeur` = 'maintenance_mode'
-                WHERE type = 'admin' AND intitule = '" . $post_no_maintenance_mode . "'"
+                WHERE type = 'admin' AND intitule = '" . $post_no_maintenance_mode."'"
             );
 
             echo '[{'.
@@ -608,9 +608,9 @@ 
             if (isset($post_prefix_before_convert) && $post_prefix_before_convert == 'true') {
                 $tables = mysqli_query($db_link, 'SHOW TABLES');
                 while ($table = mysqli_fetch_row($tables)) {
-                    if (tableExists('old_' . $table[0]) != 1 && substr($table[0], 0, 4) != 'old_') {
-                        mysqli_query($db_link, 'CREATE TABLE old_' . $table[0] . ' LIKE ' . $table[0]);
-                        mysqli_query($db_link, 'INSERT INTO old_' . $table[0] . ' SELECT * FROM ' . $table[0]);
+                    if (tableExists('old_'.$table[0]) != 1 && substr($table[0], 0, 4) != 'old_') {
+                        mysqli_query($db_link, 'CREATE TABLE old_'.$table[0].' LIKE '.$table[0]);
+                        mysqli_query($db_link, 'INSERT INTO old_'.$table[0].' SELECT * FROM '.$table[0]);
                     }
                 }
             }
@@ -618,22 +618,22 @@ 
             //convert database
             mysqli_query(
                 $db_link,
-                'ALTER DATABASE `' . $database . '`
+                'ALTER DATABASE `'.$database.'`
                 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci'
             );
 
             //convert tables
-            $res = mysqli_query($db_link, 'SHOW TABLES FROM `' . $database . '`');
+            $res = mysqli_query($db_link, 'SHOW TABLES FROM `'.$database.'`');
             while ($table = mysqli_fetch_row($res)) {
                 if (substr($table[0], 0, 4) != 'old_') {
                     mysqli_query(
                         $db_link,
-                        'ALTER TABLE ' . $database . '.`{$table[0]}`
+                        'ALTER TABLE '.$database.'.`{$table[0]}`
                         CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci'
                     );
                     mysqli_query(
                         $db_link,
-                        'ALTER TABLE' . $database . '.`{$table[0]}`
+                        'ALTER TABLE'.$database.'.`{$table[0]}`
                         DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci'
                     );
                 }
@@ -670,7 +670,7 @@ 
                 //Do a copy of the existing file
                 if (!copy(
                     $settingsFile,
-                    $settingsFile . '.' . date(
+                    $settingsFile.'.'.date(
                         'Y_m_d_H_i_s',
                         mktime((int) date('H'), (int) date('i'), (int) date('s'), (int) date('m'), (int) date('d'), (int) date('y'))
                     )
@@ -687,7 +687,7 @@ 
                 // CHeck if old sk.php exists.
                 // If yes then get keys to database and delete it
                 if (empty($post_sk_path) === false || defined('SECUREPATH') === true) {
-                    $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH) . '/sk.php';
+                    $filename = (empty($post_sk_path) === false ? $post_sk_path : SECUREPATH).'/sk.php';
                     if (file_exists($filename)) {
                         include_once $filename;
                         unlink($filename);
@@ -696,63 +696,63 @@ 
                         // SKEY
                         $tmp = mysqli_query(
                             $db_link,
-                            "SELECT INTO `" . $pre . "misc`
+                            "SELECT INTO `".$pre."misc`
                             WHERE type = 'admin' AND intitule = 'duo_skey'"
                         );
                         if ($tmp) {
                             mysqli_query(
                                 $db_link,
-                                "UPDATE `" . $pre . "misc`
-                                set valeur = '" . SKEY . "', type = 'admin', intitule = 'duo_skey'"
+                                "UPDATE `".$pre."misc`
+                                set valeur = '" . SKEY."', type = 'admin', intitule = 'duo_skey'"
                             );
                         } else {
                             mysqli_query(
                                 $db_link,
-                                "INSERT INTO `" . $pre . "misc`
+                                "INSERT INTO `".$pre."misc`
                                 (`valeur`, `type`, `intitule`)
-                                VALUES ('" . SKEY . "', 'admin', 'duo_skey')"
+                                VALUES ('" . SKEY."', 'admin', 'duo_skey')"
                             );
                         }
 
                         // IKEY
                         $tmp = mysqli_query(
                             $db_link,
-                            "SELECT INTO `" . $pre . "misc`
+                            "SELECT INTO `".$pre."misc`
                             WHERE type = 'admin' AND intitule = 'duo_ikey'"
                         );
                         if ($tmp) {
                             mysqli_query(
                                 $db_link,
-                                "UPDATE `" . $pre . "misc`
-                                set valeur = '" . IKEY . "', type = 'admin', intitule = 'duo_ikey'"
+                                "UPDATE `".$pre."misc`
+                                set valeur = '" . IKEY."', type = 'admin', intitule = 'duo_ikey'"
                             );
                         } else {
                             mysqli_query(
                                 $db_link,
-                                "INSERT INTO `" . $pre . "misc`
+                                "INSERT INTO `".$pre."misc`
                                 (`valeur`, `type`, `intitule`)
-                                VALUES ('" . IKEY . "', 'admin', 'duo_ikey')"
+                                VALUES ('" . IKEY."', 'admin', 'duo_ikey')"
                             );
                         }
 
                         // HOST
                         $tmp = mysqli_query(
                             $db_link,
-                            "SELECT INTO `" . $pre . "misc`
+                            "SELECT INTO `".$pre."misc`
                             WHERE type = 'admin' AND intitule = 'duo_host'"
                         );
                         if ($tmp) {
                             mysqli_query(
                                 $db_link,
-                                "UPDATE `" . $pre . "misc`
-                                set valeur = '" . HOST . "', type = 'admin', intitule = 'duo_host'"
+                                "UPDATE `".$pre."misc`
+                                set valeur = '" . HOST."', type = 'admin', intitule = 'duo_host'"
                             );
                         } else {
                             mysqli_query(
                                 $db_link,
-                                "INSERT INTO `" . $pre . "misc`
+                                "INSERT INTO `".$pre."misc`
                                 (`valeur`, `type`, `intitule`)
-                                VALUES ('" . HOST . "', 'admin', 'duo_host')"
+                                VALUES ('" . HOST."', 'admin', 'duo_host')"
                             );
                         }
                     }
@@ -771,13 +771,13 @@ 
                     utf8_encode(
                         '<?php
     // DATABASE connexion parameters
-    define("DB_HOST", "' . DB_HOST . '");
-    define("DB_USER", "' . DB_USER . '");
-    define("DB_PASSWD", "' . defuse_return_decrypted(DB_PASSWD) . '");
-    define("DB_NAME", "' . DB_NAME . '");
-    define("DB_PREFIX", "' . DB_PREFIX . '");
-    define("DB_PORT", "' . DB_PORT . '");
-    define("DB_ENCODING", "' . DB_ENCODING . '");
+    define("DB_HOST", "' . DB_HOST.'");
+    define("DB_USER", "' . DB_USER.'");
+    define("DB_PASSWD", "' . defuse_return_decrypted(DB_PASSWD).'");
+    define("DB_NAME", "' . DB_NAME.'");
+    define("DB_PREFIX", "' . DB_PREFIX.'");
+    define("DB_PORT", "' . DB_PORT.'");
+    define("DB_ENCODING", "' . DB_ENCODING.'");
     define("DB_SSL", false); // if DB over SSL then comment this line
     // if DB over SSL then uncomment the following lines
     //define("DB_SSL", array(
@@ -790,7 +790,7 @@ 
     define("DB_CONNECT_OPTIONS", array(
         MYSQLI_OPT_CONNECT_TIMEOUT => 10
     ));
-    define("SECUREPATH", "' . SECUREPATH. '");
+    define("SECUREPATH", "' . SECUREPATH.'");
 
     if (isset($_SESSION[\'settings\'][\'timezone\']) === true) {
     date_default_timezone_set($_SESSION[\'settings\'][\'timezone\']);
@@ -885,7 +885,7 @@ 
                     if (
                         copy(
                             $csrfp_file,
-                            $csrfp_file . '.' . date(
+                            $csrfp_file.'.'.date(
                                 'Y_m_d_H_i_s',
                                 mktime((int) date('H'), (int) date('i'), (int) date('s'), (int) date('m'), (int) date('d'), (int) date('y'))
                             )
@@ -904,17 +904,17 @@ 
                 unlink($csrfp_file); // delete existing csrfp.config file
                 copy($csrfp_file_sample, $csrfp_file); // make a copy of csrfp.config.sample file
                 $data = file_get_contents('../includes/libraries/csrfp/libs/csrfp.config.php');
-                $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "' . bin2hex(openssl_random_pseudo_bytes(25)) . '"', $data);
+                $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "'.bin2hex(openssl_random_pseudo_bytes(25)).'"', $data);
                 $newdata = str_replace('"tokenLength" => "25"', '"tokenLength" => "50"', $newdata);
-                $jsUrl = $post_url_path . '/includes/libraries/csrfp/js/csrfprotector.js';
-                $newdata = str_replace('"jsUrl" => ""', '"jsUrl" => "' . $jsUrl . '"', $newdata);
+                $jsUrl = $post_url_path.'/includes/libraries/csrfp/js/csrfprotector.js';
+                $newdata = str_replace('"jsUrl" => ""', '"jsUrl" => "'.$jsUrl.'"', $newdata);
                 $newdata = str_replace('"verifyGetFor" => array()', '"verifyGetFor" => array("*page=items&type=duo_check*")', $newdata);
                 file_put_contents('../includes/libraries/csrfp/libs/csrfp.config.php', $newdata);
 
                 // Mark a tag to force Install stuff (folders, files and table) to be cleanup while first login
                 mysqli_query(
                     $db_link,
-                    'INSERT INTO `' . $pre . 'misc` (`type`, `intitule`, `valeur`) VALUES ("install", "clear_install_folder", "true")'
+                    'INSERT INTO `'.$pre.'misc` (`type`, `intitule`, `valeur`) VALUES ("install", "clear_install_folder", "true")'
                 );
 
                 array_push(
@@ -936,19 +936,19 @@ 
 
             // update with correct version
             // 1st - check if teampass_version exists
-            $data = mysqli_fetch_row(mysqli_query($db_link, "SELECT COUNT(*) FROM ".$pre . "misc WHERE type = 'admin' AND intitule = 'teampass_version';"));
+            $data = mysqli_fetch_row(mysqli_query($db_link, "SELECT COUNT(*) FROM ".$pre."misc WHERE type = 'admin' AND intitule = 'teampass_version';"));
             if ((int) $data[0] === 0) {
                 // change variable name and put version
                 mysqli_query(
                     $db_link,
-                    "UPDATE `" . $pre . "misc`
+                    "UPDATE `".$pre."misc`
                     SET `valeur` = '".TP_VERSION."', `intitule` = 'teampass_version'
                     WHERE intitule = 'cpassman_version' AND type = 'admin';"
                 );
             } else {
                 mysqli_query(
                     $db_link,
-                    "UPDATE `" . $pre . "misc`
+                    "UPDATE `".$pre."misc`
                     SET `valeur` = '".TP_VERSION."'
                     WHERE intitule = 'teampass_version' AND type = 'admin';"
                 );
@@ -978,7 +978,7 @@ 
                             ->setDayOfMonth('*')
                             ->setMonths('*')
                             ->setDayOfWeek('*')
-                            ->setTaskCommandLine($phpLocation['path'] . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
+                            ->setTaskCommandLine($phpLocation['path'].' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
                             ->setComments('Teampass scheduler');
                         
                         $crontabRepository->addJob($crontabJob);
@@ -1034,7 +1034,7 @@ 
 
             $mysqli = new mysqli($server, $user, $pass, $database, $port);
             if ($mysqli->connect_error) {
-                die('Error : (' . $mysqli->connect_errno . ') ' . $mysqli->connect_error);
+                die('Error : ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
             }
 
             $results = $mysqli->query('SHOW TABLES');
@@ -1044,11 +1044,11 @@ 
             }
 
             // Prepare file
-            $backup_file_name = 'sql-backup-' . date('d-m-Y--h-i-s') . '.sql';
-            $fp = fopen('../files/' . $backup_file_name, 'a');
+            $backup_file_name = 'sql-backup-'.date('d-m-Y--h-i-s').'.sql';
+            $fp = fopen('../files/'.$backup_file_name, 'a');
 
             foreach ($mtables as $table) {
-                $contents = '-- Table `' . $table . "` --\n";
+                $contents = '-- Table `'.$table."` --\n";
                 if (fwrite($fp, $contents) === false) {
                     echo '[{'.
                         '"error" : "Backup fails - please do it manually",'.
@@ -1058,9 +1058,9 @@ 
                     return false;
                 }
 
-                $results = $mysqli->query('SHOW CREATE TABLE ' . $table);
+                $results = $mysqli->query('SHOW CREATE TABLE '.$table);
                 while ($row = $results->fetch_array()) {
-                    $contents = $row[1] . ";\n\n";
+                    $contents = $row[1].";\n\n";
                     if (fwrite($fp, $contents) === false) {
                         echo '[{'.
                             '"error" : "Backup fails - please do it manually",'.
@@ -1071,14 +1071,14 @@ 
                     }
                 }
 
-                $results = $mysqli->query('SELECT * FROM ' . $table);
+                $results = $mysqli->query('SELECT * FROM '.$table);
                 $row_count = $results->num_rows;
                 $fields = $results->fetch_fields();
                 $fields_count = count($fields);
 
-                $insert_head = 'INSERT INTO `' . $table . '` (';
+                $insert_head = 'INSERT INTO `'.$table.'` (';
                 for ($i = 0; $i < $fields_count; ++$i) {
-                    $insert_head .= '`' . $fields[$i]->name . '`';
+                    $insert_head .= '`'.$fields[$i]->name.'`';
                     if ($i < $fields_count - 1) {
                         $insert_head .= ', ';
                     }
@@ -1127,7 +1127,7 @@ 
                                     break;
                                 default:
                                     //$contents .= "'".$row_content."'";
-                                    if (fwrite($fp, "'" . $row_content . "'") === false) {
+                                    if (fwrite($fp, "'".$row_content."'") === false) {
                                         echo '[{'.
                                             '"error" : "Backup fails - please do it manually",'.
                                             '"index" : ""'.

Braces +15 added lines, -6 removed lines

@@ -191,18 +191,27 @@
 define("SECUREPATH", "' . str_replace('\\', '\\\\', SECUREPATH) . '");';
 define("SECUREFILE", "' . SECUREFILE. '");
 
-		if (defined('IKEY') === true) $settingsTxt .= '
+		if (defined('IKEY') === true) {
+		    $settingsTxt .= '
 define("IKEY", "' . IKEY . '");';
-		else $settingsTxt .= '
+		} else {
+		    $settingsTxt .= '
 define("IKEY", "");';
-		if (defined('SKEY') === true) $settingsTxt .= '
+		}
+		if (defined('SKEY') === true) {
+		    $settingsTxt .= '
 define("SKEY", "' . SKEY . '");';
-		else $settingsTxt .= '
+		} else {
+		    $settingsTxt .= '
 define("SKEY", "");';
-		if (defined('HOST') === true) $settingsTxt .= '
+		}
+		if (defined('HOST') === true) {
+		    $settingsTxt .= '
 define("HOST", "' . HOST . '");';
-		else $settingsTxt .= '
+		} else {
+		    $settingsTxt .= '
 define("HOST", "");';
+		}
 
 
         $settingsTxt .= '

install--ASUPPRIMER/upgrade_operations.php

Spacing +38 added lines, -38 removed lines

@@ -81,8 +81,8 @@ 
         $port
     );
 } else {
-    $res = 'Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error());
-    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: ' . addslashes(mysqli_connect_error()) . '!"}]';
+    $res = 'Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error());
+    echo '[{"finish":"1", "msg":"", "error":"Impossible to get connected to server. Error is: '.addslashes(mysqli_connect_error()).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -147,7 +147,7 @@ 
             // OPERATION - 20231017_1 - remove all existing keys
             // if item is personal and user is not owner
 
-            installPurgeUnnecessaryKeys(true, 0,$pre);
+            installPurgeUnnecessaryKeys(true, 0, $pre);
     }
     // Return back
     echo '[{"finish":"'.$finish.'" , "next":"", "error":"", "total":"'.$total.'"}]';
@@ -161,8 +161,8 @@ 
     $items = mysqli_query(
         $db_link,
         "select i.id as id, ls.date as datetime
-        from `" . $pre . "items` as i
-        inner join `" . $pre . "log_items` as ls on ls.id_item = i.id
+        from `" . $pre."items` as i
+        inner join `" . $pre."log_items` as ls on ls.id_item = i.id
         WHERE ls.action = 'at_creation' AND i.created_at IS NULL
         LIMIT " . $post_nb.";"
     );
@@ -171,7 +171,7 @@ 
             // update created_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "items` SET created_at = '".$item['datetime']."' WHERE id = ".$item['id']
+                "UPDATE `".$pre."items` SET created_at = '".$item['datetime']."' WHERE id = ".$item['id']
             );
         }
     }
@@ -180,7 +180,7 @@ 
     $remainingItems = mysqli_num_rows(
         mysqli_query(
             $db_link,
-            "SELECT * FROM `" . $pre . "items` WHERE created_at IS NULL"
+            "SELECT * FROM `".$pre."items` WHERE created_at IS NULL"
         )
     );
     return $remainingItems > 0 ? 0 : 1;
@@ -192,15 +192,15 @@ 
     // loop on items - updated_at
     $items = mysqli_query(
         $db_link,
-        "select i.id as id, (select date from " . $pre . "log_items where action = 'at_modification' and id_item=id order by date DESC limit 1) as datetime 
-        from `" . $pre . "items` as i;"
+        "select i.id as id, (select date from ".$pre."log_items where action = 'at_modification' and id_item=id order by date DESC limit 1) as datetime 
+        from `" . $pre."items` as i;"
     );
     while ($item = mysqli_fetch_assoc($items)) {
         if (is_null($item['datetime']) === false) {
             // update updated_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "items` SET updated_at = '".$item['datetime']."' WHERE id = ".$item['id']
+                "UPDATE `".$pre."items` SET updated_at = '".$item['datetime']."' WHERE id = ".$item['id']
             );
         }
     }
@@ -214,15 +214,15 @@ 
     // loop on items - deleted_at
     $items = mysqli_query(
         $db_link,
-        "select i.id as id, (select date from " . $pre . "log_items where action = 'at_deleted' and id_item=id order by date DESC limit 1) as datetime
-        from `" . $pre . "items` as i;"
+        "select i.id as id, (select date from ".$pre."log_items where action = 'at_deleted' and id_item=id order by date DESC limit 1) as datetime
+        from `" . $pre."items` as i;"
     );
     while ($item = mysqli_fetch_assoc($items)) {
         if (is_null($item['datetime']) === false) {
             // update updated_at field
             mysqli_query(
                 $db_link,
-                "UPDATE `" . $pre . "items` SET deleted_at = '".$item['datetime']."' WHERE id = ".$item['id']
+                "UPDATE `".$pre."items` SET deleted_at = '".$item['datetime']."' WHERE id = ".$item['id']
             );
         }
     }
@@ -238,14 +238,14 @@ 
  * @param integer $user_id
  * @return void
  */
-function installPurgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0, string $pre)
+function installPurgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0, string $pre)
 {
     global $db_link;
     if ($allUsers === true) {
         $users = mysqli_query(
             $db_link,
             'SELECT id
-            FROM ' . $pre . 'users
+            FROM ' . $pre.'users
             WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
             ORDER BY login ASC'
         );
@@ -263,7 +263,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function installPurgeUnnecessaryKeysForUser(int $user_id=0, string $pre)
+function installPurgeUnnecessaryKeysForUser(int $user_id = 0, string $pre)
 {
     global $db_link;
     if ($user_id === 0) {
@@ -273,8 +273,8 @@ 
     $result = mysqli_query(
         $db_link,
         'SELECT id
-        FROM ' . $pre . 'items AS i
-        INNER JOIN ' . $pre . 'log_items AS li ON li.id_item = i.id
+        FROM ' . $pre.'items AS i
+        INNER JOIN ' . $pre.'log_items AS li ON li.id_item = i.id
         WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN ('.TP_USER_ID.', '.$user_id.')',
     );
     $rowcount = mysqli_num_rows($result);
@@ -290,25 +290,25 @@ 
         // Item keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_items
+            'DELETE FROM '.$pre.'sharekeys_items
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
         // Files keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_files
+            'DELETE FROM '.$pre.'sharekeys_files
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
         // Fields keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_fields
+            'DELETE FROM '.$pre.'sharekeys_fields
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
         // Logs keys
         mysqli_query(
             $db_link,
-            'DELETE FROM ' . $pre . 'sharekeys_logs
+            'DELETE FROM '.$pre.'sharekeys_logs
             WHERE object_id IN ('.$pfItemsList.') AND user_id NOT IN ('.TP_USER_ID.', '.$user_id.')'
         );
     }
@@ -340,7 +340,7 @@ 
     // force full list of folders
     if (count($folderIds) === 0) {
         $result = $mysqli2->query('SELECT id
-            FROM ' . $pre . 'nested_tree
+            FROM ' . $pre.'nested_tree
             WHERE personal_folder = 0',
         );
         $rowcount = $result->num_rows;
@@ -361,8 +361,8 @@ 
         $arrCatList = array();
         $result = $mysqli2->query('SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
             f.id_category AS category_id
-            FROM ' . $pre . 'categories_folders AS f
-            INNER JOIN ' . $pre . 'categories AS c ON (f.id_category = c.parent_id)
+            FROM ' . $pre.'categories_folders AS f
+            INNER JOIN ' . $pre.'categories AS c ON (f.id_category = c.parent_id)
             WHERE id_folder = '.$folder
         );
         $rowcount = $result->num_rows;
@@ -387,7 +387,7 @@ 
         // Now get complexity
         $valTemp = '';
         $result = $mysqli2->query('SELECT valeur
-            FROM ' . $pre . 'misc
+            FROM ' . $pre.'misc
             WHERE type = "complex" AND intitule = '.$folder
         );
         $rowcount = $result->num_rows;
@@ -404,21 +404,21 @@ 
         // Now get Roles
         $valTemp = '';
         $result = $mysqli2->query('SELECT t.title
-            FROM ' . $pre . 'roles_values as v
-            INNER JOIN ' . $pre . 'roles_title as t ON (v.role_id = t.id)
+            FROM ' . $pre.'roles_values as v
+            INNER JOIN ' . $pre.'roles_title as t ON (v.role_id = t.id)
             WHERE v.folder_id = '.$folder.'
             GROUP BY title'
         );
         $rowcount = $result->num_rows;
         if ($rowcount > 0) {
             while ($row = $result->fetch_assoc()) {
-                $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $row['title'];
+                $valTemp .= (empty($valTemp) === true ? '' : ' - ').$row['title'];
             }
         }
         $arr_data['visibilityRoles'] = $valTemp;
 
         // now save in DB
-        $mysqli2->query("UPDATE " . $pre . "nested_tree SET categories = '".json_encode($arr_data)."' WHERE id = ".$folder);
+        $mysqli2->query("UPDATE ".$pre."nested_tree SET categories = '".json_encode($arr_data)."' WHERE id = ".$folder);
     }
     
     mysqli_close($mysqli2);
@@ -437,7 +437,7 @@ 
  */
 function installHandleConfigFile($action, $SETTINGS, $field = null, $value = null)
 {
-    $tp_config_file = $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
+    $tp_config_file = $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
     $filename = '../includes/config/settings.php';
     include_once '../sources/main.functions.php';
     $pass = defuse_return_decrypted(DB_PASSWD);
@@ -452,8 +452,8 @@ 
     if (file_exists($tp_config_file) === false || $action === 'rebuild') {
         // perform a copy
         if (file_exists($tp_config_file)) {
-            if (! copy($tp_config_file, $tp_config_file . '.' . date('Y_m_d_His', time()))) {
-                return "ERROR: Could not copy file '" . $tp_config_file . "'";
+            if (!copy($tp_config_file, $tp_config_file.'.'.date('Y_m_d_His', time()))) {
+                return "ERROR: Could not copy file '".$tp_config_file."'";
             }
         }
 
@@ -464,13 +464,13 @@ 
         $data[2] = "\$SETTINGS = array (\n";
 
         $result = $mysqli2->query('SELECT *
-            FROM ' . $pre . 'misc
+            FROM ' . $pre.'misc
             WHERE type = "admin"'
         );
         $rowcount = $result->num_rows;
         if ($rowcount > 0) {
             while ($row = $result->fetch_assoc()) {
-                array_push($data, "    '" . $row['intitule'] . "' => '" . htmlspecialchars_decode($row['valeur'], ENT_COMPAT) . "',\n");
+                array_push($data, "    '".$row['intitule']."' => '".htmlspecialchars_decode($row['valeur'], ENT_COMPAT)."',\n");
             }
         }
         array_push($data, ");\n");
@@ -485,15 +485,15 @@ 
                 break;
             }
 
-            if (stristr($line, "'" . $field . "' => '")) {
-                $data[$inc] = "    '" . $field . "' => '" . htmlspecialchars_decode($value ?? '', ENT_COMPAT) . "',\n";
+            if (stristr($line, "'".$field."' => '")) {
+                $data[$inc] = "    '".$field."' => '".htmlspecialchars_decode($value ?? '', ENT_COMPAT)."',\n";
                 $bFound = true;
                 break;
             }
             ++$inc;
         }
         if ($bFound === false) {
-            $data[$inc] = "    '" . $field . "' => '" . htmlspecialchars_decode($value ?? '', ENT_COMPAT). "',\n);\n";
+            $data[$inc] = "    '".$field."' => '".htmlspecialchars_decode($value ?? '', ENT_COMPAT)."',\n);\n";
         }
     }
     mysqli_close($mysqli2);

install--ASUPPRIMER/migrate_users_to_v3.php

Spacing +1 added lines, -1 removed lines

@@ -41,4 +41,4 @@
 } else {
     $finished = 0;
 }
-echo '[{"finish":"' . $finished . '", "scriptname":"' . $scripts_list[$post_file_number][0] . '", "parameter":"' . $scripts_list[$post_file_number][1] . '"}]';
+echo '[{"finish":"'.$finished.'", "scriptname":"'.$scripts_list[$post_file_number][0].'", "parameter":"'.$scripts_list[$post_file_number][1].'"}]';