Merge pull request #64 from aivus/fix_remove_servers

Fix duplicate servers after remove
ptrofimov · Sep 4, 2014 · 4d46de7 · 4d46de7
2 parents 9bcbdd5 + 64710f0
commit 4d46de7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/include.php b/lib/include.php
@@ -349,8 +349,10 @@ protected function _actionDeleteAll($tube = null) {
     protected function _actionServersRemove() {
         $server = $_GET['removeServer'];
         $this->servers = array_diff($this->servers, array($server));
-        if (count($this->servers)) {
-            setcookie('beansServers', implode(';', $this->servers), time() + 86400 * 365);
+        // Servers from cookies save to cookies
+        $cookie_servers = array_intersect($this->servers, explode(';', $_COOKIE['beansServers']));
+        if (count($cookie_servers)) {
+            setcookie('beansServers', implode(';', $cookie_servers), time() + 86400 * 365);
         } else {
             // no servers, clear cookie
             setcookie('beansServers', '', time() - 86400 * 365);