Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-04 07:34:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Related #503. Fixed issue when clearing search data. Favorite icon was not reset. Thanks to @k-s-dean for the feedback

Browse Source 
* [FIX] Fixed issue when saving user's password when login through LDAP
This commit is contained in:
nuxsmin
2017-03-16 01:45:39 +01:00
parent c0c142f683
commit aab802a92e
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/SP/Controller/LoginController.class.php
View File

@@ -479,7 +479,7 @@ class LoginController
// 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();

6
inc/SP/Mgmt/Users/UserLdap.class.php
View File

@@ -28,6 +28,7 @@ use SP\Config\Config;
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 @@ defined('APP_ROOT') || die();
* Class UserLdap
*
* @package SP
* @property UserLoginData $itemData
*/
class UserLdap extends User
{
@@ -111,7 +113,7 @@ class UserLdap extends User
$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 @@ class UserLdap extends User
$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());

5
inc/themes/material-blue/js/app-theme.js
View File

@@ -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]);

9
inc/themes/material-blue/js/app-theme.min.js vendored
View File

@@ -13,7 +13,8 @@ a.config().LANG[29]+"</li>"),k=k+('<li class="mdl-menu__item reset"><i class="ma
function(){g(b);b.focus()});d.find(".passComplexity").on("click",function(){h()});d.find(".showpass").on("mouseover",function(){$(this).attr("title",b.val())});d.find(".reset").on("click",function(){b.val("");var a=$("#"+c+"R");0<a.length&&a.val("");componentHandler.upgradeDom()});b.attr("data-pass-upgraded","true")}});b.find(".passwordfield__input-show").each(function(){var b=$(this),d=$('<i class="showpass material-icons" title="'+a.config().LANG[32]+'" data-targetid="'+b.attr("id")+'">remove_red_eye</i>'),
c=$('<i class="clip-pass-icon material-icons" title="'+a.config().LANG[34]+'" data-clipboard-text="'+b.val()+'">content_paste</i>');b.parent().after(c).after(d);d.on("mouseover",function(){d.attr("title",b.val())})})},n=function(b){f.info("setupDatePicker");var c={format:"YYYY-MM-DD",lang:a.config().LOCALE.substr(0,2),time:!1,cancelText:a.config().LANG[44],okText:a.config().LANG[43],clearText:a.config().LANG[30],nowText:a.config().LANG[56],minDate:new Date,triggerEvent:"dateIconClick"};b.find(".password-datefield__input").each(function(){var b=
$(this);b.bootstrapMaterialDatePicker(c);b.parent().append("<input type='hidden' name='passworddatechange_unix' value='"+moment.tz(b.val(),a.config().TIMEZONE).format("X")+"' />");b.parent().next("i").on("click",function(){b.trigger("dateIconClick")});b.on("change",function(){var c;c=moment.tz(b.val(),a.config().TIMEZONE).format("X");b.parent().find("input[name='passworddatechange_unix']").val(c)})})};return{passwordDetect:l,password:g,viewsTriggers:{main:function(){var a=document.querySelector(".mdl-layout");
$(".mdl-layout__drawer").find("a").click(function(){a.MaterialLayout.toggleDrawer()})},search:function(){var b=$("#frmSearch"),c=$("#res-content");b.find(".icon-searchfav").on("click",function(){var c=$(this).find("i"),d=b.find("input[name='searchfav']");0==d.val()?(c.addClass("mdl-color-text--amber-A200"),c.attr("title",a.config().LANG[53]),d.val(1)):(c.removeClass("mdl-color-text--amber-A200"),c.attr("title",a.config().LANG[52]),d.val(0));b.submit()});var d=b.find("#tags")[0],e=b.find(".search-filters-tags"),
k=b.find("i.show-filter");c.on("click","#data-search-header .sort-down,#data-search-header .sort-up",function(){var b=$(this);b.parent().find("a").addClass("filterOn");a.appActions().account.sort(b)}).on("click","#search-rows i.icon-favorite",function(){var b=$(this);a.appActions().account.savefavorite(b,function(){"on"===b.data("status")?(b.addClass("mdl-color-text--amber-A100"),b.attr("title",a.config().LANG[50]),b.html("star")):(b.removeClass("mdl-color-text--amber-A100"),b.attr("title",a.config().LANG[49]),
b.html("star_border"))})}).on("click","#search-rows span.tag",function(){e.is(":hidden")&&k.trigger("click");d.selectize.addItem($(this).data("tag-id"))});k.on("click",function(){var a=$(this);e.is(":hidden")?(e.slideDown("slow"),a.html(a.data("icon-up"))):(e.slideUp("slow"),a.html(a.data("icon-down")))});0<d.selectedOptions.length&&k.trigger("click")},common:function(a){l(a);n(a)}},loading:c,ajax:{complete:function(){f.info("ajax:complete");componentHandler.upgradeDom()}},html:{getList:function(a){var b=
$('<ul class="ldap-list-item mdl-list"></ul>'),c=$('<li class="mdl-list__item"></li>'),e=$('<span class="mdl-list__item-primary-content"></span>');a.forEach(function(a){var d=e.clone();d.append('<i class="material-icons mdl-list__item-icon">person</i>');d.append(a);a=c.clone().append(d);b.append(a)});return b},tabs:{add:function(a,c,d,e){a=$(a);var b="";1===e&&(a.parent().find("#tabs-"+c).addClass("is-active"),b="is-active");a.append('<a href="#tabs-'+c+'" class="mdl-tabs__tab '+b+'">'+d+"</a>")}}}}};
$(".mdl-layout__drawer").find("a").click(function(){a.MaterialLayout.toggleDrawer()})},search:function(){var b=$("#frmSearch"),c=$("#res-content");b.find("button.btn-clear").on("click",function(a){$(".icon-searchfav").find("i").removeClass("mdl-color-text--amber-A200")});b.find(".icon-searchfav").on("click",function(){var c=$(this).find("i"),d=b.find("input[name='searchfav']");0==d.val()?(c.addClass("mdl-color-text--amber-A200"),c.attr("title",a.config().LANG[53]),d.val(1)):(c.removeClass("mdl-color-text--amber-A200"),
c.attr("title",a.config().LANG[52]),d.val(0));b.submit()});var d=b.find("#tags")[0],e=b.find(".search-filters-tags"),k=b.find("i.show-filter");c.on("click","#data-search-header .sort-down,#data-search-header .sort-up",function(){var b=$(this);b.parent().find("a").addClass("filterOn");a.appActions().account.sort(b)}).on("click","#search-rows i.icon-favorite",function(){var b=$(this);a.appActions().account.savefavorite(b,function(){"on"===b.data("status")?(b.addClass("mdl-color-text--amber-A100"),b.attr("title",
a.config().LANG[50]),b.html("star")):(b.removeClass("mdl-color-text--amber-A100"),b.attr("title",a.config().LANG[49]),b.html("star_border"))})}).on("click","#search-rows span.tag",function(){e.is(":hidden")&&k.trigger("click");d.selectize.addItem($(this).data("tag-id"))});k.on("click",function(){var a=$(this);e.is(":hidden")?(e.slideDown("slow"),a.html(a.data("icon-up"))):(e.slideUp("slow"),a.html(a.data("icon-down")))});0<d.selectedOptions.length&&k.trigger("click")},common:function(a){l(a);n(a)}},
loading:c,ajax:{complete:function(){f.info("ajax:complete");componentHandler.upgradeDom()}},html:{getList:function(a){var b=$('<ul class="ldap-list-item mdl-list"></ul>'),c=$('<li class="mdl-list__item"></li>'),e=$('<span class="mdl-list__item-primary-content"></span>');a.forEach(function(a){var d=e.clone();d.append('<i class="material-icons mdl-list__item-icon">person</i>');d.append(a);a=c.clone().append(d);b.append(a)});return b},tabs:{add:function(a,c,d,e){a=$(a);var b="";1===e&&(a.parent().find("#tabs-"+
c).addClass("is-active"),b="is-active");a.append('<a href="#tabs-'+c+'" class="mdl-tabs__tab '+b+'">'+d+"</a>")}}}}};