Fixed issues regarding forcing restarts, and userpasswords not working correctly

server/public/assets/js/admin.js

@@ -72,6 +72,7 @@ var Admin = {
                 msg="Skipping is disabled the first 10 seconds.";
                 break;
             case "correctpass":
+                adminpass = Crypt.get_pass(chan.toLowerCase()) == undefined ? Crypt.crypt_pass(Crypt.tmp_pass) : Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase()));
                 msg="Correct password. You now have access to the sacred realm of The Admin.";
                 $("#thumbnail_form").css("display", "inline-block");
                 $("#description_form").css("display", "inline-block");
@@ -95,10 +96,11 @@ var Admin = {
         Materialize.toast(msg, 4000);
     },
 
-    pw: function(msg)
-    {
+    pw: function(msg) {
         w_p       = false;
-        adminpass = Crypt.tmp_pass;
+        if(adminpass == undefined || adminpass == "") {
+            adminpass = Crypt.get_pass(chan.toLowerCase());
+        }
         names     = ["vote","addsongs","longsongs","frontpage", "allvideos",
         "removeplay", "skip", "shuffle", "userpass"];
 
@@ -301,7 +303,18 @@ var Admin = {
         shuffling  = form.shuffle.checked;
         var pass_send = userpass == '' ? userpass : CryptoJS.SHA256(userpass).toString();
         configs    = {
-            channel: chan.toLowerCase(), voting: voting, addsongs: addsongs, longsongs: longsongs, frontpage: frontpage, allvideos: allvideos, removeplay: removeplay, adminpass: adminpass, skipping: skipping, shuffling: shuffling, userpass: pass_send, userpass_changed: userpass_changed
+            channel: chan.toLowerCase(),
+            voting: voting,
+            addsongs: addsongs,
+            longsongs: longsongs,
+            frontpage: frontpage,
+            allvideos: allvideos,
+            removeplay: removeplay,
+            adminpass: adminpass,
+            skipping: skipping,
+            shuffling: shuffling,
+            userpass: Crypt.crypt_pass(pass_send),
+            userpass_changed: userpass_changed
         };
 
         Crypt.set_userpass(chan.toLowerCase(), CryptoJS.SHA256(userpass).toString());

server/public/assets/js/listeners.js

@@ -989,7 +989,7 @@ $(document).on("change", ".password_protected", function(e) {
 	} else {
 		userpass = "";
 		if(!$(".change_user_pass").hasClass("hide")) $(".change_user_pass").addClass("hide");
-		Admin.save(false);
+		Admin.save(true);
 	}
 });
 

server/server.js

@@ -898,9 +898,9 @@ io.on('connection', function(socket){
 			var adminpass = params.adminpass;
 			var skipping = params.skipping;
 			var shuffling = params.shuffling;
-			var userpass = params.userpass;
+			var userpass = decrypt_string(socketid, params.userpass);
 
-			if((!params.userpass_changed && frontpage) || (!params.userpass_changed && userpass == "")) {
+			if((!params.userpass_changed && frontpage) || (params.userpass_changed && userpass == "")) {
 				userpass = "";
 			} else if(params.userpass_changed && userpass != "") {
 				frontpage = false;
@@ -915,10 +915,9 @@ io.on('connection', function(socket){
 				hash = adminpass;
 			}
 			db.collection(coll).find({views:{$exists:true}}, function(err, docs){
-				if(docs !== null && docs.length !== 0 && docs[0].adminpass === "" || docs[0].adminpass == hash)
-				{
-					db.collection(coll).update({views:{$exists:true}}, {
-						$set:{addsongs:addsongs,
+				if(docs !== null && docs.length !== 0 && (docs[0].adminpass === "" || docs[0].adminpass == hash)) {
+					var obj = {
+						addsongs:addsongs,
 							allvideos:allvideos,
 							frontpage:frontpage,
 							skip:skipping,
@@ -928,8 +927,14 @@ io.on('connection', function(socket){
 							longsongs:longsongs,
 							adminpass:hash,
 							desc: description,
-							userpass: userpass,
-						}
+					};
+					if(params.userpass_changed) {
+						obj["userpass"] = userpass;
+					} else if (frontpage) {
+						obj["userpass"] = "";
+					}
+					db.collection(coll).update({views:{$exists:true}}, {
+						$set:obj
 					}, function(err, docs){
 						db.collection(coll).find({views:{$exists:true}}, function(err, docs){
 							if(docs[0].adminpass !== "") docs[0].adminpass = true;
@@ -944,7 +949,7 @@ io.on('connection', function(socket){
 							{upsert:true}, function(err, docs){});
 						});
 					});
-				} else{
+				} else {
 					socket.emit("toast", "wrongpass");
 				}
 			});