From d359c8e0c27c14ea83cba51e44714d82bbd8c8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 22 Jan 2019 17:52:12 +0100
Subject: [PATCH] Fixed issue with add to other list form not correctly
 handling variables

---
 server/handlers/io.js                | 4 +++-
 server/handlers/list_change.js       | 4 +++-
 server/public/assets/js/listeners.js | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/handlers/io.js b/server/handlers/io.js
index e42efc82..32b18ff4 100644
--- a/server/handlers/io.js
+++ b/server/handlers/io.js
@@ -467,7 +467,7 @@ module.exports = function() {
             if(arr.hasOwnProperty("list")) {
                 arr.list = Functions.encodeChannelName(arr.list);
             }
-            if(coll !== undefined) {
+            if(coll !== undefined && ((arr.hasOwnProperty("offsiteAdd") && !arr.offsiteAdd) || !arr.hasOwnProperty("offsiteAdd"))) {
                 try {
                     coll = arr.list;//.replace(/ /g,'');
                     if(coll.length == 0) return;
@@ -478,6 +478,8 @@ module.exports = function() {
                 } catch(e) {
                     return;
                 }
+            } else if(arr.hasOwnProperty("offsiteAdd") && arr.offsiteAdd) {
+                arr.list = Functions.removeEmojis(arr.list).toLowerCase();
             }
             ListChange.add_function(arr, coll, guid, offline, socket);
         });
diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js
index e28aa6d3..a99e12d7 100644
--- a/server/handlers/list_change.js
+++ b/server/handlers/list_change.js
@@ -401,7 +401,9 @@ function add_function(arr, coll, guid, offline, socket) {
             socket.emit('update_required', result);
             return;
         }
-
+        if(arr.hasOwnProperty("offsiteAdd") && arr.offsiteAdd) {
+            coll = arr.list;
+        }
         Functions.getSessionAdminUser(Functions.getSession(socket), coll, function(userpass, adminpass) {
             if(adminpass != "" || arr.adminpass == undefined) {
                 arr.adminpass = Functions.hash_pass(adminpass);
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 1d4be00d..3b16c0cd 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -1802,6 +1802,7 @@ function addDynamicListeners() {
             } else if(event.keyCode == 32 && document.querySelector(".search-container").classList.contains("hide") && window.location.pathname != "/" &&
             document.querySelector("#text-chat-input") != document.activeElement &&
             document.querySelector("#password") != document.activeElement &&
+            document.querySelector("#other-list-name-add") != document.activeElement &&
             document.querySelector("#user-pass-input") != document.activeElement &&
             document.querySelector("#thumbnail_input") != document.activeElement &&
             document.querySelector("#rules_input") != document.activeElement &&