From eaaec7e93c4c76f984d6759b9d1634cbe287f497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 15 Apr 2015 20:52:16 +0200
Subject: [PATCH] Search now always returns 6 answers hopefully

---
 server/server.js    | 14 ++++++++++++++
 static/js/admin.js  | 15 +++++++++++++--
 static/js/list.js   |  5 ++++-
 static/js/search.js | 10 ++++++----
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/server/server.js b/server/server.js
index 4631c744..b13ebd1f 100755
--- a/server/server.js
+++ b/server/server.js
@@ -163,6 +163,20 @@ io.on('connection', function(socket){
     }
   });
 
+  socket.on('password', function(pw)
+  {
+
+    db.collection(coll).find({views:{$exists:true}}, function(err, docs){
+      if(docs[0]["adminpass"] == "" || docs[0]["adminpass"] == hash_pass(pw))
+      {
+        db.collection(coll).update({views:{$exists:true}}, {$set:{adminpass:hash_pass(pw)}}, function(err, docs)
+        {
+          socket.emit("pw", pw);
+        })
+      }
+    });
+  });
+
   socket.on('skip', function(list)
   {
   	db.collection(coll).find({skip: false}, function(err, docs){
diff --git a/static/js/admin.js b/static/js/admin.js
index 036346d7..fb9a2c35 100755
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -1,6 +1,7 @@
 var adminTogg = false;
 var pass_corr = "";
 
+
 socket.on("toast", function(msg)
 {
 	pass_corr = "correct";
@@ -11,6 +12,16 @@ socket.on("toast", function(msg)
 	remove_bar();*/
 });
 
+socket.on("pw", function(msg)
+{
+	w_p = false;
+	adminpass = msg;
+	names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"];
+	for (var i = 0; i < names.length; i++) {
+			$("input[name="+names[i]+"]").attr("disabled", false);
+	}
+});
+
 socket.on(chan.toLowerCase()+",conf", function(msg)
 {
 	populate_list(msg, true);
@@ -23,7 +34,7 @@ $('input[class=conf]').change(function()
 
 function pass_save()
 {
-	save();
+	socket.emit('password', document.getElementById("password").value);
 }
 
 //function used in html onlick
@@ -40,7 +51,7 @@ function submitAdmin(form)
 	frontpage = form.frontpage.checked;
 	allvideos = form.allvideos.checked;
 	removeplay = form.removeplay.checked;
-	adminpass = document.getElementById("password").value;
+	//adminpass = document.getElementById("password").value;
 	skipping = form.skip.checked;
 	shuffling = form.shuffle.checked;
 
diff --git a/static/js/list.js b/static/js/list.js
index 335872ea..c285dd09 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -7,6 +7,7 @@ var showToggle =true;
 var chan = $("#chan").html();
 var list_html = $("#list-song-html").html();
 var hasadmin=0;
+var w_p = true;
 
 socket.on(guid, function(msg){
 	populate_list(msg, false);
@@ -42,8 +43,10 @@ function populate_list(msg, conf_only)
 				console.log("startTime");
 				if(!adminTogg)
 				{
-					if(listeID['adminpass'] == "") hasadmin = false;
+					if(listeID['adminpass'] == "" || w_p == false) hasadmin = false;
 					else hasadmin = true;
+					music = listeID["allvideos"];
+					longsongs = listeID["longsongs"];
 					names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"];
 					for (var i = 0; i < names.length; i++) {
 						document.getElementsByName(names[i])[0].checked = (listeID[names[i]] === true);
diff --git a/static/js/search.js b/static/js/search.js
index de083c99..7e25ea06 100755
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -120,7 +120,7 @@ function search(search_input){
 		if(search_input !== ""){
 			var keyword= encodeURIComponent(search_input);
 
-			var yt_url='http://gdata.youtube.com/feeds/api/videos?q='+keyword+'&format=5&orderby=relevance&max-results=6&v=2&alt=jsonc';
+			var yt_url='http://gdata.youtube.com/feeds/api/videos?q='+keyword+'&format=5&orderby=relevance&max-results=30&v=2&alt=jsonc';
 
 			$.ajax({
 				type: "GET",
@@ -131,10 +131,11 @@ function search(search_input){
 					if(response.data.items)
 					{
 						var wrapper = "";
+						z = 0;
 						$.each(response.data.items, function(i,data)
 						{
-							if(data.duration > 720 && longS === 0){return;}
-							if(data.category == "Music" || music == 1){
+							if(data.duration > 720 && longsongs == true){return;}
+							if(data.category == "Music" || music == false){
 								var video_title=encodeURIComponent(data.title).replace(/'/g, "\\\'");
 								var views=data.viewCount;
 								var video_thumb = "http://i.ytimg.com/vi/"+data.id+"/default.jpg";
@@ -147,11 +148,12 @@ function search(search_input){
 										</div>\
 								</div>";
 								//<input id='add' title='Add several songs' type='button' class='button' value='+' onclick=\"submit('"+data.id+"','"+video_title+"', false);\">\
-
 								//+data.uploader+" • "+
 								//$("#results").append(finalhtml);
 								wrapper += finalhtml;
+								z++;
 							}
+							return (z !== 6);
 						});
 						//console.log(wrapper);
 						//$("#results").append(wrapper).show("slow");