2.1.27

Fix for #2398, #2395, #2376
nilsteampassnet · Aug 29, 2018 · 9fa6152 · 9fa6152
1 parent 6cabfd1
commit 9fa6152
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,10 @@
 2.1.27
+
+21/
+ #2398 User unable to change their own password from profile window
+ #2395 php warning in logs
+ #2376 fix link in readme
+
 20/
  #2394 knowledge base page characters appear with "?"
  #2393 After Deleting User, KB Is Blank

diff --git a/includes/config/include.php b/includes/config/include.php
@@ -12,7 +12,7 @@
 global $SETTINGS, $languagesList, $SETTINGS_EXT;
 
 $SETTINGS_EXT['version'] = "2.1.27";
-$SETTINGS_EXT['version_full'] = $SETTINGS_EXT['version'].".20";
+$SETTINGS_EXT['version_full'] = $SETTINGS_EXT['version'].".21";
 $SETTINGS_EXT['tool_name'] = "TeamPass";
 $SETTINGS_EXT['one_day_seconds'] = 86400;
 $SETTINGS_EXT['one_week_seconds'] = 604800;

diff --git a/index.php b/index.php
@@ -942,7 +942,7 @@ function updateLogonButton(timeToGo){
 if (isset($SETTINGS['enable_pf_feature']) && $SETTINGS['enable_pf_feature'] === "1") {
     echo '
         <div id="div_set_personal_saltkey" style="display:none;padding:4px;">
-            <div style="text-align:center;margin:5px;padding:3px;" id="expected_psk_complexPw" class="ui-widget ui-state-active ui-corner-all hidden">', isset($SETTINGS['personal_saltkey_security_level']) === true && empty($SETTINGS['personal_saltkey_security_level']) === false ? $LANG['complex_asked']." : ".$SETTINGS_EXT['pwComplexity'][$SETTINGS['personal_saltkey_security_level']][1] : '', '</div>
+            <div style="text-align:center;margin:5px;padding:3px;" id="expected_psk_complexPw" class="ui-widget ui-state-active ui-corner-all hidden">', isset($SETTINGS['personal_saltkey_security_level']) === true && empty($SETTINGS['personal_saltkey_security_level']) === false && isset($SETTINGS_EXT['pwComplexity']) === true ? $LANG['complex_asked']." : ".$SETTINGS_EXT['pwComplexity'][$SETTINGS['personal_saltkey_security_level']][1] : '', '</div>
             <table border="0">
                 <tr>
                     <td>

diff --git a/readme.md b/readme.md
@@ -99,7 +99,7 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 ## Website
 
-Visit [Teampass.net]( * @package       /)
+Visit [Teampass.net](https://teampass.net/)
 
 ## Bugs
 

diff --git a/sources/main.queries.php b/sources/main.queries.php
@@ -134,7 +134,7 @@ function mainQuery()
                 $data = DB::query(
                     "SELECT complexity
                     FROM ".prefix_table("roles_title")."
-                    WHERE id IN (".$data_roles['fonction_id'].")
+                    WHERE id IN (".str_replace(';', ',', $data_roles['fonction_id']).")
                     ORDER BY complexity DESC"
                 );
                 if (intval(filter_input(INPUT_POST, 'complexity', FILTER_SANITIZE_NUMBER_INT)) < intval($data[0]['complexity'])) {
@@ -367,7 +367,7 @@ function mainQuery()
                     $ldap_user_never_auth = true;
                 }
             }
-
+            
             // Do treatment
             if ($counter === 0) {
                 // Not a registered user !