Embedded is now also ajour

server/public/assets/js/admin.js

@@ -72,7 +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()));
+                adminpass = Crypt.get_pass(chan.toLowerCase()) == undefined ? Crypt.tmp_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");
@@ -310,7 +310,7 @@ var Admin = {
             frontpage: frontpage,
             allvideos: allvideos,
             removeplay: removeplay,
-            adminpass: adminpass,
+            adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass),
             skipping: skipping,
             shuffling: shuffling,
             userpass: Crypt.crypt_pass(pass_send),
@@ -328,7 +328,7 @@ var Admin = {
     shuffle: function()
     {
         if(!offline){
-            socket.emit('shuffle', {adminpass: adminpass !== undefined ? adminpass : "", channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
+            socket.emit('shuffle', {adminpass: adminpass !== undefined ? Crypt.crypt_pass(adminpass) : "", channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
         } else {
             for(var x = 0; x < full_playlist.length; x++){
                 var num = Math.floor(Math.random()*1000000);

server/public/assets/js/embed.js

@@ -32,6 +32,12 @@ var connection_options = {
 	'force new connection': true
 };
 
+var Crypt = {
+	crypt_pass: function(pass) {
+		return pass;
+	}
+};
+
 $(document).ready(function(){
 
 	if(hash.length == 3 && hash[2] == "autoplay"){

server/public/assets/js/list.js

@@ -443,7 +443,7 @@ var List = {
 
 	vote: function(id, vote){
 		if(!offline || (vote == "del" && (hasadmin && (!w_p && adminpass != "")))){
-			socket.emit('vote', {channel: chan, id: id, type: vote, adminpass: adminpass, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
+			socket.emit('vote', {channel: chan, id: id, type: vote, adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
 		} else {
 			if(vote == "pos"){
 				List.voted_song(id, (new Date()).getTime()/1000);
@@ -456,7 +456,7 @@ var List = {
 
 	skip: function(){
 		if(!offline){
-			socket.emit('skip', {pass: adminpass, id:video_id, channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
+			socket.emit('skip', {pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), id:video_id, channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
 		} else {
 			Player.playNext();
 		}

server/public/assets/js/listeners.js

@@ -502,7 +502,7 @@ function chromecastListener(evt, data){
 		if(offline){
 			Player.playNext();
 		} else {
-			socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass, channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
+			socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
 		}
 		break;
 	}

server/public/assets/js/player.js

@@ -319,7 +319,7 @@ var Player = {
 		if(!user_auth_started) {
 			if(newState.data == 5 || newState.data == 100 || newState.data == 101 || newState.data == 150) {
 				curr_playing = Player.player.getVideoUrl().replace("https://www.youtube.com/watch?v=", "");
-				socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass, channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
+				socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
 
 			} else if(video_id !== undefined) {
 				Player.loadVideoById(video_id);

server/public/assets/js/search.js

@@ -386,7 +386,7 @@ var Search = {
 				List.vote(id, "pos");
 			}
 		} else {
-			socket.emit("add", {id: id, title: decodeURIComponent(title), adminpass: adminpass, list: chan.toLowerCase(), duration: duration, playlist: playlist, num: num, total: full_num, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
+			socket.emit("add", {id: id, title: decodeURIComponent(title), adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), list: chan.toLowerCase(), duration: duration, playlist: playlist, num: num, total: full_num, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
 		}//[id, decodeURIComponent(title), adminpass, duration, playlist]);
 	},