Merge branch 'development'

nilsteampassnet · Jul 6, 2017 · 23a2eba · 23a2eba
2 parents 9289e15 + 52885ef
commit 23a2eba
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/favico.ico → favicon.ico b/favico.ico → favicon.ico
diff --git a/includes/config/include.php b/includes/config/include.php
@@ -12,7 +12,7 @@
 global $settings, $languagesList;
 
 $k['version'] = "2.1.27";
-$k['version_full'] = "2.1.27.6";
+$k['version_full'] = "2.1.27.7";
 $k['tool_name'] = "TeamPass";
 $k['one_day_seconds'] = 86400;
 $k['one_week_seconds'] = 604800;

diff --git a/install/install.queries.php b/install/install.queries.php
@@ -848,7 +848,7 @@ function bCrypt($password, $cost)
                         $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."users` WHERE login = 'admin'"));
                         if ($tmp == 0) {
                             $mysqli_result = mysqli_query($dbTmp,
-                                "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `admin`, `gestionnaire`, `personal_folder`, `groupes_visibles`, `email`, `encrypted_psk`, `last_password_change`) VALUES ('1', 'admin', '".bCrypt($var['admin_pwd'], '13')."', '1', '0', '0', '', '', '', '".time()."')"
+                                "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `admin`, `gestionnaire`, `personal_folder`, `groupes_visibles`, `email`, `encrypted_psk`, `last_pw_change`) VALUES ('1', 'admin', '".bCrypt($var['admin_pwd'], '13')."', '1', '0', '0', '', '', '', '".time()."')"
                             );
                         } else {
                             $mysqli_result = mysqli_query($dbTmp, "UPDATE `".$var['tbl_prefix']."users` SET `pw` = '".bCrypt($var['admin_pwd'], '13')."' WHERE login = 'admin' AND id = '1'");