* [FIX] Related #503. Fixed issue when clearing search data. Favorite…

… icon was not reset. Thanks to @k-s-dean for the feedback * [FIX] Fixed issue when saving user's password when login through LDAP
nuxsmin · Mar 16, 2017 · aab802a · aab802a
1 parent c0c142f
commit aab802a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/inc/SP/Controller/LoginController.class.php b/inc/SP/Controller/LoginController.class.php
@@ -479,7 +479,7 @@ protected function authLdap(LdapAuthData $LdapAuthData)
             // Verificamos si el usuario existe en la BBDD
             if (UserLdap::checkLDAPUserInDB($this->UserData->getLogin())) {
                 // Actualizamos el usuario de LDAP en MySQL
-                UserLdap::getItem($this->UserData)->update();
+                UserLdap::getItem($this->UserData)->updateOnLogin();
             } else {
                 // Creamos el usuario de LDAP en MySQL
                 UserLdap::getItem($this->UserData)->add();

diff --git a/inc/SP/Mgmt/Users/UserLdap.class.php b/inc/SP/Mgmt/Users/UserLdap.class.php
@@ -28,6 +28,7 @@
 use SP\Core\Crypt\Hash;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Messages\LogMessage;
+use SP\DataModel\UserLoginData;
 use SP\Log\Email;
 use SP\Log\Log;
 use SP\Storage\DB;
@@ -39,6 +40,7 @@
  * Class UserLdap
  *
  * @package SP
+ * @property UserLoginData $itemData
  */
 class UserLdap extends User
 {
@@ -111,7 +113,7 @@ public function add()
         $Data->addParam((int)$this->itemData->isUserIsAdminAcc());
         $Data->addParam((int)$this->itemData->isUserIsDisabled());
         $Data->addParam((int)$this->itemData->isUserIsChangePass());
-        $Data->addParam(Hash::hashKey($this->itemData->getUserPass()));
+        $Data->addParam(Hash::hashKey($this->itemData->getLoginPass()));
         $Data->setOnErrorMessage(__('Error al guardar los datos de LDAP', false));
 
         DB::getQuery($Data);
@@ -208,7 +210,7 @@ public function updateOnLogin()
 
         $Data = new QueryData();
         $Data->setQuery($query);
-        $Data->addParam(Hash::hashKey($this->itemData->getUserPass()));
+        $Data->addParam(Hash::hashKey($this->itemData->getLoginPass()));
         $Data->addParam($this->itemData->getUserName());
         $Data->addParam($this->itemData->getUserEmail());
         $Data->addParam($this->itemData->getUserLogin());

diff --git a/inc/themes/material-blue/js/app-theme.js b/inc/themes/material-blue/js/app-theme.js
@@ -339,11 +339,14 @@ sysPass.Theme = function (Common) {
             var $frmSearch = $("#frmSearch");
             var $resContent = $("#res-content");
 
+            $frmSearch.find("button.btn-clear").on("click", function (e) {
+                $(".icon-searchfav").find("i").removeClass("mdl-color-text--amber-A200");
+            });
+
             $frmSearch.find(".icon-searchfav").on("click", function () {
                 var $icon = $(this).find("i");
                 var $searchfav = $frmSearch.find("input[name='searchfav']");
 
-
                 if ($searchfav.val() == 0) {
                     $icon.addClass("mdl-color-text--amber-A200");
                     $icon.attr("title", Common.config().LANG[53]);

diff --git a/inc/themes/material-blue/js/app-theme.min.js b/inc/themes/material-blue/js/app-theme.min.js