Hump.fm: remove dump.fm branding

1 files changed, 3 insertions, 2 deletions

diff --git a/static/js/fullscreen.js b/static/js/fullscreen.js
index 38e09ee..89cb163 100755
--- a/static/js/fullscreen.js
+++ b/static/js/fullscreen.js
@@ -1,5 +1,5 @@
 function initFullscreen(room){
-    Room = room || "dumpfm";
+    Room = room || (typeof window.DefaultRoom === 'string' && window.DefaultRoom ? window.DefaultRoom : 'humpfm');
     // Timestamp = Timestamp || Date.now();
     refresh();
     ImageCache = [];
@@ -121,7 +121,8 @@ function login() {
     var nick = $('#nickInput').val();
     var password = $('#passwordInput').val() || '';
     var rememberme = $('#remembermeInput').attr('checked') ? 'yes' : '';
-    var hash = password ? hex_sha1(nick + '$' + password + '$dumpfm') : '';
+    var salt = (typeof window.AuthSalt === 'string' && window.AuthSalt) ? window.AuthSalt : 'humpfm';
+    var hash = password ? hex_sha1(nick + '$' + password + '$' + salt) : '';
 
     var onSuccess = function(json) {
 	//  if (typeof pageTracker !== 'undefined') {