nilsteampassnet / TeamPass

install/upgrade_run_2.1.27.php

Spacing +22 added lines, -22 removed lines

@@ -1056,7 +1056,7 @@ 
 mysqli_query(
     $db_link,
     "ALTER TABLE `".$pre."nested_tree` CHANGE `nleft` `nleft` INT(11) NULL DEFAULT NULL, CHANGE `nright` `nright` INT(11) NULL DEFAULT NULL, CHANGE `nlevel` `nlevel` INT(11) NULL DEFAULT NULL;"
-);"
+); "
 
 
 
@@ -1076,8 +1076,8 @@ 
     `folder_id` tinyint(12) NOT NULL,
     `user_id` tinyint(12) NOT NULL,
     `timestamp` varchar(50) NOT NULL DEFAULT 'none',
-    PRIMARY KEY (`id`)
-    ) CHARSET=utf8;"
+    PRIMARY KEY(`id`)
+    ) CHARSET = utf8; "
 );
 
 
@@ -1088,7 +1088,7 @@ 
     "longblob DEFAULT NULL"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field content to table files! '.mysqli_error($db_link).'!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field content to table files!'.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1101,8 +1101,8 @@ 
     `increment_id` int(12) NOT NULL AUTO_INCREMENT,
     `item_id` int(12) NOT NULL,
     `category_id` int(12) NOT NULL,
-    PRIMARY KEY (`increment_id`)
-    ) CHARSET=utf8;"
+    PRIMARY KEY(`increment_id`)
+    ) CHARSET = utf8; "
 );
 
 
@@ -1115,12 +1115,12 @@ 
     "VARCHAR(50) NOT NULL DEFAULT '0'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field agses-usercardid to table Users! '.mysqli_error($db_link).'!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field agses - usercardid to table Users!'.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
 
-// fill in this new field with the current "encryption-file" status
+// fill in this new field with the current "encryption - file" status
 $tmp = mysqli_fetch_row(mysqli_query($db_link, "SELECT valeur FROM `".$pre."misc` WHERE type = 'admin' AND intitule = 'enable_attachment_encryption'"));
 if (!empty($tmp[0])) {
     if ($tmp[0] === "1") {
@@ -1137,14 +1137,14 @@ 
 if (intval($tmp) === 0) {
     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`) VALUES ('9999991', 'OTV', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0')"
+        "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`) VALUES('9999991', 'OTV', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0')"
     );
 }
 $tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."users` WHERE id = '9999991' AND login = 'OTV'"));
 if (intval($tmp) === 0) {
     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`) VALUES ('9999999', 'API', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0')"
+        "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`) VALUES('9999999', 'API', '', '', '', '', '', '', '1', '', '', '', '0', '', '', '', '0')"
     );
 }
 
@@ -1163,7 +1163,7 @@ 
 
 // Remove some indexes
 mysqli_query($db_link, "ALTER TABLE ".$pre."nested_tree` DROP INDEX `id`;");
-mysqli_query($db_link, "ALTER TABLE ".$pre."tags` DROP INDEX `id`;");
+mysqli_query($db_link, "ALTER TABLE ".$pre."tags` DROP INDEX `id`; ");
 
 
 // add field masked to CATEGORIES table
@@ -1173,7 +1173,7 @@ 
     "tinyint(1) NOT NULL default '0'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field masked to table CATEGORIES! '.mysqli_error($db_link).'!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field masked to table CATEGORIES!'.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1186,7 +1186,7 @@ 
     "VARCHAR(250) NOT NULL DEFAULT 'all'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field role_visibility to table CATEGORIES! '.mysqli_error($db_link).'!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field role_visibility to table CATEGORIES!'.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1199,7 +1199,7 @@ 
     "tinyint(1) NOT NULL DEFAULT '0'"
 );
 if ($res === false) {
-    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field is_mandatory to table CATEGORIES! '.mysqli_error($db_link).'!"}]';
+    echo '[{"finish":"1", "msg":"", "error":"An error appears when adding field is_mandatory to table CATEGORIES!'.mysqli_error($db_link).'!"}]';
     mysqli_close($db_link);
     exit();
 }
@@ -1224,10 +1224,10 @@ 
 /*
 * Introduce new CONFIG file
 */
-$tp_config_file = "../includes/config/tp.config.php";
+$tp_config_file = ".. / includes / config / tp.config.php";
 if (file_exists($tp_config_file)) {
     if (!copy($tp_config_file, $tp_config_file.'.'.date("Y_m_d", mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
-        echo '[{"error" : "includes/config/tp.config.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
+        echo '[{"error" : "includes / config / tp.config.php file already exists and cannot be renamed.Please do it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
         return false;
     } else {
         unlink($tp_config_file);
@@ -1241,7 +1241,7 @@ 
 while ($row = mysqli_fetch_assoc($result)) {
     // append new setting in config file
     $config_text .= "
-    '".$row['intitule']."' => '".$row['valeur']."',";
+    '".$row['intitule']."' => '".$row['valeur']."', ";
     if ($any_settings === false) {
         $any_settings = true;
     }
@@ -1253,10 +1253,10 @@ 
     $result = fwrite(
         $file_handler,
         utf8_encode(
-            "<?php
+            " < ?php
 global \$SETTINGS;
-\$SETTINGS = array (" . $config_text."
-);"
+\$SETTINGS = array(" . $config_text."
+); "
         )
     );
 }
@@ -1264,14 +1264,14 @@ 
 
 
 // Generate API key by user
-$result = mysqli_query($db_link, "SELECT id FROM `".$pre."users` WHERE login NOT IN ('admin', 'API', 'OTV')");
+$result = mysqli_query($db_link, "SELECT id FROM `".$pre."users` WHERE login NOT IN('admin', 'API', 'OTV')");
 while ($row = mysqli_fetch_assoc($result)) {
     // Check if key already exists
     $tmp = mysqli_num_rows(mysqli_query($db_link, "SELECT * FROM `".$pre."api` WHERE label = '".$row['id']."'"));
     if (intval($tmp) === 0) {
         mysqli_query(
             $db_link,
-            "INSERT INTO `".$pre."api` (`type`, `label`, `value`, `timestamp`) VALUES ('user', '".$row['id']."', '".uniqidReal(39)."', '".time()."')"
+            "INSERT INTO `".$pre."api` (`type`, `label`, `value`, `timestamp`) VALUES('user', '".$row['id']."', '".uniqidReal(39)."', '".time()."')"
         );
     }
 }

Braces +3 added lines, -1 removed lines

@@ -1227,7 +1227,8 @@ 
 $tp_config_file = "../includes/config/tp.config.php";
 if (file_exists($tp_config_file)) {
     if (!copy($tp_config_file, $tp_config_file.'.'.date("Y_m_d", mktime(0, 0, 0, (int) date('m'), (int) date('d'), (int) date('y'))))) {
-        echo '[{"error" : "includes/config/tp.config.php file already exists and cannot be renamed. Please do it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
+        echo '[{"error" : "includes/config/tp.config.php file already exists and cannot be renamed. Please do {
+    it by yourself and click on button Launch.", "result":"", "index" : "'.$post_index.'", "multiple" : "'.$post_multiple.'"}]';
         return false;
     } else {
         unlink($tp_config_file);
@@ -1255,6 +1256,7 @@ 
         utf8_encode(
             "<?php
 global \$SETTINGS;
+}
 \$SETTINGS = array (" . $config_text."
 );"
         )

includes/language/english.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 global $LANG;
-$LANG = array (
+$LANG = array(
     '2fa_authentication_selector' => '',
     'user_ga_code' => 'Email Google Authentication to user',
     'send_ga_code' => 'Set and email Google Authentication code',