Merge pull request #707 from causefx/cero-dev

Cero dev

settings.php

@@ -2268,7 +2268,7 @@ echo buildSettings(
                                         <a href='https://reddit.com/r/organizr' target='_blank' type='button' style="background: #AD80FD" class='btn waves btn-labeled btn-success btn text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-reddit'></i></span>SUBREDDIT</a>
                                         <a href='https://github.com/causefx/Organizr/issues/new' target='_blank' type='button' class='btn waves btn-labeled btn-success btn text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-github-alt'></i></span><?php echo $language->translate("SUBMIT_ISSUE");?></a>
                                         <a href='https://github.com/causefx/Organizr' target='_blank' type='button' class='btn waves btn-labeled btn-primary btn text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-github'></i></span><?php echo $language->translate("VIEW_ON_GITHUB");?></a>
-                                        <a href='https://gitter.im/Organizrr/Lobby' target='_blank' type='button' class='btn waves btn-labeled btn-dark btn text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-comments-o'></i></span><?php echo $language->translate("CHAT_WITH_US");?></a>
+                                        <a href='https://discord.gg/XvbT6nz' target='_blank' type='button' class='btn waves btn-labeled btn-dark btn text-uppercase waves-effect waves-float'><span class='btn-label'><i class='fa fa-comments-o'></i></span><?php echo $language->translate("CHAT_WITH_US");?></a>
                                         <button type="button" class="class='btn waves btn-labeled btn-warning btn text-uppercase waves-effect waves-float" data-toggle="modal" data-target=".Help-Me-modal-lg"><span class='btn-label'><i class='fa fa-life-ring'></i></span><?php echo $language->translate("HELP");?></button>
                                         <!--<button id="deleteToggle" type="button" class="class='btn waves btn-labeled btn-danger btn text-uppercase waves-effect waves-float" ><span class='btn-label'><i class='fa fa-trash'></i></span><?php echo $language->translate("DELETE_DATABASE");?></button>-->
                                     </p>

user.php

@@ -451,32 +451,33 @@
 			// logged in, but do the tokens match?
 			$token = $this->get_user_token($username);
 			//Check Token with Session
-			if($token){
+			if(isset($_SESSION["token"])){
 				if($token == $_SESSION["token"]) { setcookie("cookiePassword", COOKIEPASSWORD, time() + (86400 * 7), "/", DOMAIN); return true; }
-	            if(isset($_COOKIE["Organizr"]) && isset($_COOKIE["OrganizrU"]) && isset($_COOKIE["cookiePassword"])){
-	                if($_COOKIE["cookiePassword"] == COOKIEPASSWORD && strlen($_COOKIE["Organizr"]) == 32){
-	                    return true;
-	                }else{
-	                    $this->error("cookie token mismatch for $username");
-	                    unset($_COOKIE['Organizr']);
-	                    setcookie('Organizr', '', time() - 3600, '/', DOMAIN);
-	                    setcookie('Organizr', '', time() - 3600, '/');
-	                    unset($_COOKIE['OrganizrU']);
-	                    setcookie('OrganizrU', '', time() - 3600, '/', DOMAIN);
-	                    setcookie('OrganizrU', '', time() - 3600, '/');
-	                    unset($_COOKIE['cookiePassword']);
-	                    setcookie("cookiePassword", '', time() - 3600, '/', DOMAIN);
-	                    setcookie("cookiePassword", '', time() - 3600, '/');
-						unset($_COOKIE['Auth']);
-			            setcookie("Auth", '', time() - 3600, '/', DOMAIN);
-			            setcookie("Auth", '', time() - 3600, '/');
-						unset($_COOKIE['mpt']);
-			            setcookie("mpt", '', time() - 3600, '/', DOMAIN);
-			            setcookie("mpt", '', time() - 3600, '/');
-	                    return false;
-	                }
-				}
 			}
+            if(isset($_COOKIE["Organizr"]) && isset($_COOKIE["OrganizrU"]) && isset($_COOKIE["cookiePassword"])){
+                if($_COOKIE["cookiePassword"] == COOKIEPASSWORD && strlen($_COOKIE["Organizr"]) == 32){
+                    return true;
+                }else{
+                    $this->error("cookie token mismatch for $username");
+                    unset($_COOKIE['Organizr']);
+                    setcookie('Organizr', '', time() - 3600, '/', DOMAIN);
+                    setcookie('Organizr', '', time() - 3600, '/');
+                    unset($_COOKIE['OrganizrU']);
+                    setcookie('OrganizrU', '', time() - 3600, '/', DOMAIN);
+                    setcookie('OrganizrU', '', time() - 3600, '/');
+                    unset($_COOKIE['cookiePassword']);
+                    setcookie("cookiePassword", '', time() - 3600, '/', DOMAIN);
+                    setcookie("cookiePassword", '', time() - 3600, '/');
+					unset($_COOKIE['Auth']);
+		            setcookie("Auth", '', time() - 3600, '/', DOMAIN);
+		            setcookie("Auth", '', time() - 3600, '/');
+					unset($_COOKIE['mpt']);
+		            setcookie("mpt", '', time() - 3600, '/', DOMAIN);
+		            setcookie("mpt", '', time() - 3600, '/');
+                    return false;
+                }
+			}
+
 			return false;
 		}
 		/**