Skip to content

Commit 851a078

Browse files
author
Jon Watte
committed
Minor config tweaks
1 parent 614cd9d commit 851a078

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

files/graph.js

+5-11
Original file line numberDiff line numberDiff line change
@@ -2309,7 +2309,7 @@ var SettingsModel = Backbone.Model.extend({
23092309
if (!_.isUndefined(login_cookie)) {
23102310
var piece = login_cookie.split(':');
23112311
var user = this.users.findWhere({username: piece[0]});
2312-
if (!_.isUndefined(user) && user.get('password_hash') === piece[1]) {
2312+
if (!_.isUndefined(user)) {
23132313
return user.get('username');
23142314
}
23152315
else {
@@ -2359,16 +2359,10 @@ var SettingsModel = Backbone.Model.extend({
23592359
);
23602360
}
23612361
else {
2362-
if (user.get('password_hash') == password_hash) {
2363-
$.cookie('login', username + ':' + password_hash, {expires: 12, path: '/'});
2364-
this.trigger('logged_in', user);
2365-
}
2366-
else {
2367-
console.log('Your hash was ' + password_hash);
2368-
console.log('Desired hash was ' + user.get('password_hash'));
2369-
console.log('Username was ' + username);
2370-
errorDialog('Bad password. Check log for proper hash and edit user file.');
2371-
}
2362+
// The fake, client-side password was causing more problems than it solved.
2363+
// Carry the data forward, but don't enforce it.
2364+
$.cookie('login', username + ':' + password_hash, {expires: 12, path: '/'});
2365+
this.trigger('logged_in', user);
23722366
}
23732367

23742368
},

istatd-tiny.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# http interface
99
#--files-dir /usr/share/istatd/files
10-
--files-dir /home/cit/local_github/istatd/files
10+
--files-dir /home/cit/imvu/istatd/files
1111
--http-port 8110
1212

1313
# daemon configuration

0 commit comments

Comments
 (0)