KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed individual cookies for channelpass and global cookie for settings

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-11-23 23:17:51 +01:00
parent ef270b36ba
commit a6bd76d641
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

43
static/js/crypt.js
View File

@@ -4,15 +4,14 @@ var Crypt = {
init: function(){ init: function(){
conf_arr = Crypt.decrypt(Crypt.getCookie("_opt"), "_opt");
conf_arr = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase())); conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase());
Hostcontroller.change_enabled(conf_arr.remote); Hostcontroller.change_enabled(conf_arr.remote);
}, },
decrypt: function(cookie){ decrypt: function(cookie, name){
if(Crypt.getCookie(name) === undefined) {
if(Crypt.getCookie(chan.toLowerCase()) === undefined) { cookie = Crypt.create_cookie(name);
cookie = Crypt.create_cookie();
} }
var decrypted = CryptoJS.AES.decrypt( var decrypted = CryptoJS.AES.decrypt(
@@ -38,7 +37,7 @@ var Crypt = {
return decrypted.toString(CryptoJS.enc.Utf8); return decrypted.toString(CryptoJS.enc.Utf8);
}, },
encrypt: function(json_formated){ encrypt: function(json_formated, cookie){
var to_encrypt = JSON.stringify(json_formated); var to_encrypt = JSON.stringify(json_formated);
var encrypted = CryptoJS.AES.encrypt( var encrypted = CryptoJS.AES.encrypt(
@@ -53,21 +52,23 @@ var Crypt = {
var CookieDate = new Date; var CookieDate = new Date;
CookieDate.setFullYear(CookieDate.getFullYear( ) +1); CookieDate.setFullYear(CookieDate.getFullYear( ) +1);
document.cookie = chan.toLowerCase()+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" document.cookie = cookie+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"
}, },
get_volume: function(){ get_volume: function(){
return Crypt.decrypt(Crypt.getCookie(chan.toLowerCase())).volume; return Crypt.decrypt(Crypt.getCookie("_opt"), "_opt").volume;
//return conf_arr.volume; //return conf_arr.volume;
}, },
set_volume: function(val){ set_volume: function(val){
conf_arr.volume = val; conf_arr.volume = val;
Crypt.encrypt(conf_arr); Crypt.encrypt(conf_arr, "_opt");
}, },
create_cookie: function(){ create_cookie: function(name){
cookie_object = {volume: 100, width: 100, remote: true, passwords: {}}; if(name == "_opt") cookie_object = {volume: 100, width: 100, remote: true};
else cookie_object = {passwords: {}};
var string_it = JSON.stringify(cookie_object); var string_it = JSON.stringify(cookie_object);
@@ -83,28 +84,28 @@ var Crypt = {
var CookieDate = new Date; var CookieDate = new Date;
CookieDate.setFullYear(CookieDate.getFullYear( ) +1); CookieDate.setFullYear(CookieDate.getFullYear( ) +1);
document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"
document.cookie = chan.toLowerCase()+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" //document.cookie = na"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"
return Crypt.getCookie(chan.toLowerCase()); return Crypt.getCookie(name);
}, },
set_pass: function(chan, pass){ set_pass: function(chan, pass){
conf_arr.passwords[chan] = pass; conf_pass.passwords[chan] = pass;
Crypt.encrypt(conf_arr); Crypt.encrypt(conf_pass);
}, },
remove_pass:function(chan){ remove_pass:function(chan){
delete conf_arr.passwords[chan]; delete conf_pass.passwords[chan];
Crypt.encrypt(conf_arr); Crypt.encrypt(conf_pass, chan.toLowerCase());
}, },
get_pass: function(chan){ get_pass: function(chan){
return conf_arr.passwords[chan]; return conf_pass.passwords[chan];
}, },
set_remote: function(val){ set_remote: function(val){
conf_arr.remote = val; conf_arr.remote = val;
Crypt.encrypt(conf_arr); Crypt.encrypt(conf_arr, "_opt");
}, },
get_remote: function(val){ get_remote: function(val){