Fixes

Fixes #87 - Multiple Logins
Fixes #83 - Loading color
Adds hover color.
Skipped Develop on accident.  Make sure to visit #upgrade after
upgrading.

index.php

@@ -21,6 +21,8 @@ $activetabicon = "#FFFFFF";
 $activetabtext = "#FFFFFF";
 $inactiveicon = "#FFFFFF";
 $inactivetext = "#FFFFFF";
+$loading = "#000000";
+$hovertext = "#000000";
 $loadingIcon = "images/organizr.png";
 $baseURL = "";
 require_once("translate.php");
@@ -241,6 +243,8 @@ else :
             $activetabtext = $row['activetabtext'];
             $inactiveicon = $row['inactiveicon'];
             $inactivetext = $row['inactivetext'];
+            $loading = $row['loading'];
+            $hovertext = $row['hovertext'];
 
         endforeach;
 
@@ -382,7 +386,7 @@ endif;
                 
                 }.refresh-preloader {
                     
-                    background: <?=$topbartext;?>;
+                    background: <?=$loading;?>;
                 
                 }.la-timer {
                     
@@ -397,7 +401,7 @@ endif;
                     
                     .tab-item:hover a {
                     
-                        color: <?=$sidebar;?> !important;
+                        color: <?=$hovertext;?> !important;
                         background: <?=$hoverbg;?>;
                         border-radius: 100px 0 0 100px;
                     
@@ -459,7 +463,7 @@ endif;
                     
                 }div#preloader {
                     
-                    background-color: <?=$topbartext;?>;
+                    background-color: <?=$loading;?>;
                     
                 }.iframe {
                     
@@ -573,6 +577,27 @@ endif;
                                     
                                     </a>
                                 
+                                </li>
+                                
+                                <li style="display: none;" class="tab-item" id="updatedb.phpx" data-title="Upgrade" name="upgrade">
+                                                            
+                                    <a class="tab-link">
+                                        
+                                        <?php if($settingsicon == "Yes") :
+                                        
+                                            echo '<i style="font-size: 19px; padding: 0 10px; font-size: 19px;">
+                                                <img id="upgrade-icon" src="images/upgrade.png" style="height: 30px; margin-top: -2px;"></i>';
+                                        
+                                        else :
+                                        
+                                            echo '<i id="upgrade-icon" class="fa fa-arrow-up"></i>';
+                                        
+                                        endif; ?>
+                                        
+                                        <?php echo $language->translate("UPGRADE");?>
+                                    
+                                    </a>
+                                
                                 </li>
                                 <?php endif; endif;?>
                                 
@@ -1341,7 +1366,11 @@ endif;
 
                 var getLiTab = $("li[name^='" + gotHash + "']");
                 
+                if(gotHash === "upgrade"){ getLiTab.toggle(); console.log("got it"); }
+                
                 getLiTab.trigger("click");
+                
+                
 
             }   
 

lang/de.ini

@@ -136,4 +136,16 @@ NO_ENTRIES = "Keine anzuzeigenden Einträge"
 FILTERED = "(gefiltert aus|Gesamteinträgen)"
 NO_MATCHING = "Keine passenden Einträge gefunden"
 TAB_NOT_LOADING = "Tab not loading?"
-TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+MULTIPLE_LOGINS = "Multiple Logins"
+USER_ICONS = "User Icons - Gravatar Icons"
+USER_ICONS_ABOUT = "User icons are based off the icons that are set on Gravatar using the email address provided.  If you would like to change yours or have someone add an icon to their email have them go here:"
+KEYBOARD_INSTRUCTIONS5 = "will allow you to switch through the tab in numerical order - Tabs 1 through 9 only"
+KEYBOARD_INSTRUCTIONS6 = "will enter or exit Fullscreen mode"
+KEYBOARD_INSTRUCTIONS7 = "will pin or unpin the sidebar"
+KEYBOARD_INSTRUCTIONS8 = "will open or close the menu"
+TRANSLATIONS = "Translations"
+TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak another language other than English, please try and help out if you can.  If you are willing to help, please head to Github and offer what you can."
+UPGRADE = "Upgrade"
+LOADING_COLOR = "Loading Background"
+HOVER_TEXT = "Hover Text"

lang/en.ini

@@ -136,4 +136,16 @@ NO_ENTRIES = "No entries to show"
 FILTERED = "(filtered from|total entries)"
 NO_MATCHING = "No matching records found"
 TAB_NOT_LOADING = "Tab not loading?"
-TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+MULTIPLE_LOGINS = "Multiple Logins"
+USER_ICONS = "User Icons - Gravatar Icons"
+USER_ICONS_ABOUT = "User icons are based off the icons that are set on Gravatar using the email address provided.  If you would like to change yours or have someone add an icon to their email have them go here:"
+KEYBOARD_INSTRUCTIONS5 = "will allow you to switch through the tab in numerical order - Tabs 1 through 9 only"
+KEYBOARD_INSTRUCTIONS6 = "will enter or exit Fullscreen mode"
+KEYBOARD_INSTRUCTIONS7 = "will pin or unpin the sidebar"
+KEYBOARD_INSTRUCTIONS8 = "will open or close the menu"
+TRANSLATIONS = "Translations"
+TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak another language other than English, please try and help out if you can.  If you are willing to help, please head to Github and offer what you can."
+UPGRADE = "Upgrade"
+LOADING_COLOR = "Loading Background"
+HOVER_TEXT = "Hover Text"

lang/es.ini

@@ -136,4 +136,16 @@ NO_ENTRIES = "No entries to show"
 FILTERED = "(filtered from|total entries)"
 NO_MATCHING = "No matching records found"
 TAB_NOT_LOADING = "Tab not loading?"
-TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+MULTIPLE_LOGINS = "Multiple Logins"
+USER_ICONS = "User Icons - Gravatar Icons"
+USER_ICONS_ABOUT = "User icons are based off the icons that are set on Gravatar using the email address provided.  If you would like to change yours or have someone add an icon to their email have them go here:"
+KEYBOARD_INSTRUCTIONS5 = "will allow you to switch through the tab in numerical order - Tabs 1 through 9 only"
+KEYBOARD_INSTRUCTIONS6 = "will enter or exit Fullscreen mode"
+KEYBOARD_INSTRUCTIONS7 = "will pin or unpin the sidebar"
+KEYBOARD_INSTRUCTIONS8 = "will open or close the menu"
+TRANSLATIONS = "Translations"
+TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak another language other than English, please try and help out if you can.  If you are willing to help, please head to Github and offer what you can."
+UPGRADE = "Upgrade"
+LOADING_COLOR = "Loading Background"
+HOVER_TEXT = "Hover Text"

lang/fr.ini

@@ -135,5 +135,17 @@ CLOSE = "Fermer"
 NO_ENTRIES = "Aucune entrée à afficher"
 FILTERED = "(filtré de|entrées totales)"
 NO_MATCHING = "Aucun enregistrement correspondant trouvé"
-TAB_NOT_LOADING = "Tab not loading?"
-TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+TAB_NOT_LOADING = "Onglet ne se charge pas?"
+TAB_NOT_LOADING_ABOUT = "Certains sites bloquent l'affichage dans un iFrame.  Pour contourner cela, nous pouvons installer un plugin pour ignorer les en-têtes envoyés par ces pages web, nous permettant ainsi de charger le site. Voici le téléchargement pour votre navigateur:"
+MULTIPLE_LOGINS = "Multiple Logins"
+USER_ICONS = "User Icons - Gravatar Icons"
+USER_ICONS_ABOUT = "User icons are based off the icons that are set on Gravatar using the email address provided.  If you would like to change yours or have someone add an icon to their email have them go here:"
+KEYBOARD_INSTRUCTIONS5 = "will allow you to switch through the tab in numerical order - Tabs 1 through 9 only"
+KEYBOARD_INSTRUCTIONS6 = "will enter or exit Fullscreen mode"
+KEYBOARD_INSTRUCTIONS7 = "will pin or unpin the sidebar"
+KEYBOARD_INSTRUCTIONS8 = "will open or close the menu"
+TRANSLATIONS = "Translations"
+TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak another language other than English, please try and help out if you can.  If you are willing to help, please head to Github and offer what you can."
+UPGRADE = "Upgrade"
+LOADING_COLOR = "Loading Background"
+HOVER_TEXT = "Hover Text"

lang/it.ini

@@ -136,4 +136,16 @@ NO_ENTRIES = "No entries to show"
 FILTERED = "(filtered from|total entries)"
 NO_MATCHING = "No matching records found"
 TAB_NOT_LOADING = "Tab not loading?"
-TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+MULTIPLE_LOGINS = "Multiple Logins"
+USER_ICONS = "User Icons - Gravatar Icons"
+USER_ICONS_ABOUT = "User icons are based off the icons that are set on Gravatar using the email address provided.  If you would like to change yours or have someone add an icon to their email have them go here:"
+KEYBOARD_INSTRUCTIONS5 = "will allow you to switch through the tab in numerical order - Tabs 1 through 9 only"
+KEYBOARD_INSTRUCTIONS6 = "will enter or exit Fullscreen mode"
+KEYBOARD_INSTRUCTIONS7 = "will pin or unpin the sidebar"
+KEYBOARD_INSTRUCTIONS8 = "will open or close the menu"
+TRANSLATIONS = "Translations"
+TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak another language other than English, please try and help out if you can.  If you are willing to help, please head to Github and offer what you can."
+UPGRADE = "Upgrade"
+LOADING_COLOR = "Loading Background"
+HOVER_TEXT = "Hover Text"

lang/nl.ini

@@ -105,35 +105,47 @@ PREVIOUS = "Vorige"
 NEXT = "Volgende"
 PRINT = "Print"
 SEARCH = "Zoek"
-SHOW = "Toon"
+SHOW_ENTRYS = "Toon"
 ENTRIES = "INZENDINGEN"
-SHOW_ENTRY_CURRENT = "Laat|tot|tot|inzendingen zien"
+SHOW_ENTRY_CURRENT = "Laat|tot|van de|inzendingen zien"
 HELP = "Help"
-ADDING_TABS = "Adding Tabs"
-QUICK_ACCESS = "Quick Access Tabs [Bookmarks/Hash]"
-START_ADDING_TABS = "To start adding tabs, all you need to do is type the Tab Name and hit ENTER. The following information is then needed:"
-TAB_URL_ABOUT = "The URL of the Tab"
-ICON_URL_ABOUT = "You may either use an icon from the box, or you may upload or use an image provided that is listed in the View Icons section"
-DEFAULT_ABOUT = "You may have one tab that will be loaded upon webpage launch"
-ACTIVE_ABOUT = "This option allows the tab to be loaded on the list of  tabs"
-USER_ABOUT = "This option allows the tab to loaded on a users lists if they are signed in"
-GUEST_ABOUT = "This option allows the tab to loaded on the list of anyone accessing the webpage"
-NO_IFRAME_ABOUT = "This option will open the tab in a new window and not inside the webpage"
-QUICK_ACCESS_ABOUT = "For easy access we have made it so you can use [#] along with the Tab Name to access your tab easily.  Just type in the hash into the URL and you are good to go.  You can use this for straight access to a tab or for a bookmark.  i.e."
-SIDE_BY_SIDE = "Side by Side View"
-SIDE_BY_SIDE_ABOUT = "For multi-taskers we have setup an easy way for you to work on two things at once.  To get started, here are the basics:"
-SIDE_BY_SIDE_INSTRUCTIONS1 = "Right-Click on any tab to enable side by side"
-SIDE_BY_SIDE_INSTRUCTIONS2 = "If you would like to refresh the right side, Right-Click on this icon"
-SIDE_BY_SIDE_INSTRUCTIONS3 = "Once you are done with side by side, use the [esc] + [esc] Keyboard Shortcut listed below"
-KEYBOARD_SHORTCUTS = "Keyboard Shortcuts"
-KEYBOARD_SHORTCUTS_ABOUT = "Organizr has some bulit-in keyboard shortcuts for ease of use.  The following is useable if Organizr has focus and not the iFrame."
-KEYBOARD_INSTRUCTIONS1 = "will take you to the settings menu"
-KEYBOARD_INSTRUCTIONS2 = "will take you to the next tab"
-KEYBOARD_INSTRUCTIONS3 = "will take you to the previous tab"
-KEYBOARD_INSTRUCTIONS4 = "will exit Side by Side View"
-CLOSE = "Close"
-NO_ENTRIES = "No entries to show"
-FILTERED = "(filtered from|total entries)"
-NO_MATCHING = "No matching records found"
-TAB_NOT_LOADING = "Tab not loading?"
-TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
+ADDING_TABS = "Tabbladen toevoegen"
+QUICK_ACCESS = "Snelle toegang"
+START_ADDING_TABS = "Het is alleen nodig om de naam van het tabblad in te vullen en ENTER te drukken om tabbladen toe te voegen. De volgende informatie is nodig:"
+TAB_URL_ABOUT = "De URL van het tabblad"
+ICON_URL_ABOUT = "Het is hiermee mogelijk om zowel een standaard icoon te kiezen, zelf een icoon te uploaden of een icoon te gebruiken uit de Bekijk Iconen sectie"
+DEFAULT_ABOUT = "Het is hiermee mogelijk om één tabblad automatisch te laden bij het opstarten van de site"
+ACTIVE_ABOUT = "Het is hiermee mogelijk een tabblad te laten zien in het menu"
+USER_ABOUT = "Het is hiermee mogelijk om een tabblad te laten zien als de gebruiker is ingelogd"
+GUEST_ABOUT = "Het is hiermee mogelijk om een tabblad door iedereen te laten zien, ongeacht of hij/zij is ingelogd"
+NO_IFRAME_ABOUT = "Het is hiermee mogelijk om een tabblad in een ander scherm te openen"
+QUICK_ACCESS_ABOUT = "Voor snel en gemakkelijk gebruik is het mogelijk om [#] samen met de naam van het tabblad te gebruiken. Typ het hekje plus de naam in de URL. Dit gkan gebruikt worden voor rechtstreekse toegang tot een tabblad of voor een bladwijzer."
+SIDE_BY_SIDE = "Bekijk naast elkaar"
+SIDE_BY_SIDE_ABOUT = "Voor multi-taskers is er de mogelijkheid om gemakkelijk aan twee dingen tegelijk te werken. Zo kan er mee begonnen worden:"
+SIDE_BY_SIDE_INSTRUCTIONS1 = "Druk de rechter muisknop op een tabblad om deze naast een andere te bekijken"
+SIDE_BY_SIDE_INSTRUCTIONS2 = "Als de rechter kant vernieuwd moet worden, druk met de rechter muisknop op het tabblad"
+SIDE_BY_SIDE_INSTRUCTIONS3 = "Als het niet meer nodig is om naast elkaar te werken, gebruik dan de [esc] + [esc] sneltoets zoals hier beneden"
+KEYBOARD_SHORTCUTS = "Toetsenbord Sneltoetsen"
+KEYBOARD_SHORTCUTS_ABOUT = "Organizr heeft een aantal handige sneltoetsen. Het volgende is mogelijk als Organizr de focus heeft ipv iFrame."
+KEYBOARD_INSTRUCTIONS1 = "brengt je naar instellingen"
+KEYBOARD_INSTRUCTIONS2 = "brengt je naar het volgende tabblad"
+KEYBOARD_INSTRUCTIONS3 = "brengt je naar het vorige tabblad"
+KEYBOARD_INSTRUCTIONS4 = "sluit zij aan zij modus"
+CLOSE = "Sluiten"
+NO_ENTRIES = "Geen inzendingen om te laten zien"
+FILTERED = "(Gefilterd van|totale inzendingen)"
+NO_MATCHING = "Geen records die overeenstemmen"
+TAB_NOT_LOADING = "Laad het tabblad niet?"
+TAB_NOT_LOADING_ABOUT = "Sommige websites ondersteunen geen iFrame door blokkade. Om dit te omzeilen, is er een plugin om de headers te negeren waardoor de website is te laden. Dit is de download voor de browser:"
+MULTIPLE_LOGINS = "Multiple Logins"
+USER_ICONS = "User Icons - Gravatar Icons"
+USER_ICONS_ABOUT = "User icons are based off the icons that are set on Gravatar using the email address provided.  If you would like to change yours or have someone add an icon to their email have them go here:"
+KEYBOARD_INSTRUCTIONS5 = "will allow you to switch through the tab in numerical order - Tabs 1 through 9 only"
+KEYBOARD_INSTRUCTIONS6 = "will enter or exit Fullscreen mode"
+KEYBOARD_INSTRUCTIONS7 = "will pin or unpin the sidebar"
+KEYBOARD_INSTRUCTIONS8 = "will open or close the menu"
+TRANSLATIONS = "Translations"
+TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak another language other than English, please try and help out if you can.  If you are willing to help, please head to Github and offer what you can."
+UPGRADE = "Upgrade"
+LOADING_COLOR = "Loading Background"
+HOVER_TEXT = "Hover Text"

settings.php

@@ -134,11 +134,13 @@ if($hasOptions == "No") :
     $bottombar = "#eb6363";
     $sidebar = "#000000";
     $hoverbg = "#eb6363";
+    $hovertext = "#000000";
     $activetabBG = "#eb6363";
     $activetabicon = "#FFFFFF";
     $activetabtext = "#FFFFFF";
     $inactiveicon = "#FFFFFF";
     $inactivetext = "#FFFFFF";
+    $loading = "#000000";
 
 endif;
 
@@ -164,11 +166,13 @@ if($hasOptions == "Yes") :
         $bottombar = $row['bottombar'];
         $sidebar = $row['sidebar'];
         $hoverbg = $row['hoverbg'];
+        @$hovertext = $row['hovertext'];
         $activetabBG = $row['activetabBG'];
         $activetabicon = $row['activetabicon'];
         $activetabtext = $row['activetabtext'];
         $inactiveicon = $row['inactiveicon'];
         $inactivetext = $row['inactivetext'];
+        @$loading = $row['loading'];
 
     endforeach;
 
@@ -336,7 +340,7 @@ if($action == "upgrade") :
     rcopy($source, $destination);
     rrmdir($cleanup);
 
-    echo "<script>window.parent.location.reload(true);</script>";
+    echo "<script>top.location.href = 'index.php#upgrade';</script>";
 
 endif;
 
@@ -358,6 +362,8 @@ if($action == "createLocation") :
 
     write_ini_file($databaseData, $databaseLocation);
 
+    echo "<script>window.parent.location.reload(true);</script>";
+
 endif;
                 
 if(!isset($_POST['op'])) :
@@ -532,7 +538,7 @@ if($action == "addOptionz") :
     
     if($hasOptions == "No") :
 
-        $file_db->exec("CREATE TABLE options (title TEXT UNIQUE, topbar TEXT, bottombar TEXT, sidebar TEXT, hoverbg TEXT, topbartext TEXT, activetabBG TEXT, activetabicon TEXT, activetabtext TEXT, inactiveicon TEXT, inactivetext TEXT)");
+        $file_db->exec("CREATE TABLE options (title TEXT UNIQUE, topbar TEXT, bottombar TEXT, sidebar TEXT, hoverbg TEXT, topbartext TEXT, activetabBG TEXT, activetabicon TEXT, activetabtext TEXT, inactiveicon TEXT, inactivetext TEXT, loading TEXT, hovertext TEXT)");
         
     endif;
             
@@ -542,14 +548,16 @@ if($action == "addOptionz") :
     $bottombar = $_POST['bottombar'];
     $sidebar = $_POST['sidebar'];
     $hoverbg = $_POST['hoverbg'];
+    $hovertext = $_POST['hovertext'];
     $activetabBG = $_POST['activetabBG'];
     $activetabicon = $_POST['activetabicon'];
     $activetabtext = $_POST['activetabtext'];
     $inactiveicon = $_POST['inactiveicon'];
     $inactivetext = $_POST['inactivetext'];
+    $loading = $_POST['loading'];
 
-    $insert = "INSERT INTO options (title, topbartext, topbar, bottombar, sidebar, hoverbg, activetabBG, activetabicon, activetabtext, inactiveicon, inactivetext) 
-                VALUES (:title, :topbartext, :topbar, :bottombar, :sidebar, :hoverbg, :activetabBG, :activetabicon , :activetabtext , :inactiveicon, :inactivetext)";
+    $insert = "INSERT INTO options (title, topbartext, topbar, bottombar, sidebar, hoverbg, activetabBG, activetabicon, activetabtext, inactiveicon, inactivetext, loading, hovertext) 
+                VALUES (:title, :topbartext, :topbar, :bottombar, :sidebar, :hoverbg, :activetabBG, :activetabicon , :activetabtext , :inactiveicon, :inactivetext, :loading, :hovertext)";
                 
     $stmt = $file_db->prepare($insert);
     
@@ -564,12 +572,11 @@ if($action == "addOptionz") :
     $stmt->bindParam(':activetabtext', $activetabtext);
     $stmt->bindParam(':inactiveicon', $inactiveicon);
     $stmt->bindParam(':inactivetext', $inactivetext);
+    $stmt->bindParam(':loading', $loading);
+    $stmt->bindParam(':hovertext', $hovertext);
 
     $stmt->execute();
 
-    
-
-    
 endif;
 ?>
 
@@ -1141,6 +1148,15 @@ endif;
                                                         <input type="text" class="form-control material" name="loadingIcon" placeholder="<?php echo $language->translate("LOADING_ICON_URL");?>" value="<?php echo LOADINGICON;?>">
 
                                                     </div>
+                                                    
+                                                    <div class="form-group">
+                                                        <?php  if(MULTIPLELOGIN == "true") : $multipleLogin = "checked"; else : $multipleLogin = ""; endif;?>
+                                                        <input id="" class="switcher switcher-success" value="false" name="multipleLogin" type="hidden">
+                                                        <input id="multipleLogin" class="switcher switcher-success" value="true" name="multipleLogin" type="checkbox" <?php echo $multipleLogin;?>>
+
+                                                        <label for="multipleLogin"></label><?php echo $language->translate("MULTIPLE_LOGINS");?>
+                                                    
+                                                    </div>
 
                                                     <button type="submit" class="btn btn-success btn-icon waves waves-circle waves-effect waves-float"><i class="fa fa-floppy-o"></i></button>
 
@@ -1308,63 +1324,220 @@ endif;
                                         
                                                     </div>
                                         
-                                                    <div class="modal-body">
-                                                        
-                                                        <h4><strong><?php echo $language->translate("ADDING_TABS");?></strong></h4>
+                                                    <div class="modal-body" style="background: <?php echo $sidebar;?> !important;">
                                                         
-                                                        <p><?php echo $language->translate("START_ADDING_TABS");?></p>
+                                                        <div style="margin-bottom: 0px;" class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+                                                            
+                                                            <div style="color: <?php echo $topbartext;?> !important; background: <?php echo $topbar;?> !important;" class="panel panel-default">
+                                                            
+                                                                <div class="panel-heading" role="tab" id="headingOne">
+                                                            
+                                                                    <h4 class="panel-title" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                                                            
+                                                                        <?php echo $language->translate("ADDING_TABS");?>
+                                                            
+                                                                    </h4>
+                                                            
+                                                                </div>
+                                                            
+                                                                <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true">
+                                                            
+                                                                    <div class="panel-body">
+                                                                
+                                                                        <p><?php echo $language->translate("START_ADDING_TABS");?></p>
+                                                            
+                                                                        <ul>
+
+                                                                            <li><strong><?php echo $language->translate("TAB_URL");?></strong> <?php echo $language->translate("TAB_URL_ABOUT");?></li>
+                                                                            <li><strong><?php echo $language->translate("ICON_URL");?></strong> <?php echo $language->translate("ICON_URL_ABOUT");?></li>
+                                                                            <li><strong><?php echo $language->translate("DEFAULT");?></strong> <?php echo $language->translate("DEFAULT_ABOUT");?></li>
+                                                                            <li><strong><?php echo $language->translate("ACTIVE");?></strong> <?php echo $language->translate("ACTIVE_ABOUT");?></li>
+                                                                            <li><strong><?php echo $language->translate("USER");?></strong> <?php echo $language->translate("USER_ABOUT");?></li>
+                                                                            <li><strong><?php echo $language->translate("GUEST");?></strong> <?php echo $language->translate("GUEST_ABOUT");?></li>
+                                                                            <li><strong><?php echo $language->translate("NO_IFRAME");?></strong> <?php echo $language->translate("NO_IFRAME_ABOUT");?></li>        
+
+                                                                        </ul>
+                                                            
+                                                                    </div>
+                                                            
+                                                                </div>
+                                                            
+                                                            </div>
+                                                            
+                                                            <div style="color: <?php echo $topbartext;?> !important; background: <?php echo $topbar;?> !important;" class="panel panel-default">
+                                                            
+                                                                <div class="panel-heading" role="tab" id="headingTwo">
+                                                            
+                                                                    <h4 class="panel-title" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
+                                                            
+                                                                        <?php echo $language->translate("QUICK_ACCESS");?>
+                                                            
+                                                                    </h4>
+                                                            
+                                                                </div>
+                                                            
+                                                                <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo" aria-expanded="true">
+                                                            
+                                                                    <div class="panel-body">
+                                                                
+                                                                        <p><?php echo $language->translate("QUICK_ACCESS_ABOUT");?> <mark><?php echo getServerPath(); ?>#Sonarr</mark></p>
+                                                            
+                                                                    </div>
+                                                            
+                                                                </div>
+                                                            
+                                                            </div>
                                                             
-                                                        <ul>
+                                                            <div style="color: <?php echo $topbartext;?> !important; background: <?php echo $topbar;?> !important;" class="panel panel-default">
+                                                            
+                                                                <div class="panel-heading" role="tab" id="headingThree">
+                                                            
+                                                                    <h4 class="panel-title" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
+                                                            
+                                                                        <?php echo $language->translate("SIDE_BY_SIDE");?>
+                                                            
+                                                                    </h4>
+                                                            
+                                                                </div>
+                                                            
+                                                                <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree" aria-expanded="true">
+                                                            
+                                                                    <div class="panel-body">
+                                                                
+                                                                        <p><?php echo $language->translate("SIDE_BY_SIDE_ABOUT");?></p>
 
-                                                            <li><strong><?php echo $language->translate("TAB_URL");?></strong> <?php echo $language->translate("TAB_URL_ABOUT");?></li>
-                                                            <li><strong><?php echo $language->translate("ICON_URL");?></strong> <?php echo $language->translate("ICON_URL_ABOUT");?></li>
-                                                            <li><strong><?php echo $language->translate("DEFAULT");?></strong> <?php echo $language->translate("DEFAULT_ABOUT");?></li>
-                                                            <li><strong><?php echo $language->translate("ACTIVE");?></strong> <?php echo $language->translate("ACTIVE_ABOUT");?></li>
-                                                            <li><strong><?php echo $language->translate("USER");?></strong> <?php echo $language->translate("USER_ABOUT");?></li>
-                                                            <li><strong><?php echo $language->translate("GUEST");?></strong> <?php echo $language->translate("GUEST_ABOUT");?></li>
-                                                            <li><strong><?php echo $language->translate("NO_IFRAME");?></strong> <?php echo $language->translate("NO_IFRAME_ABOUT");?></li>        
+                                                                        <ul>
 
-                                                        </ul>
+                                                                            <li><?php echo $language->translate("SIDE_BY_SIDE_INSTRUCTIONS1");?></li>
+                                                                            <li><?php echo $language->translate("SIDE_BY_SIDE_INSTRUCTIONS2");?> [<i class='mdi mdi-refresh'></i>]</li>
+                                                                            <li><?php echo $language->translate("SIDE_BY_SIDE_INSTRUCTIONS3");?></li>
 
-                                                        <h4><strong><?php echo $language->translate("QUICK_ACCESS");?></strong></h4>
-                                                    
-                                                        <p><?php echo $language->translate("QUICK_ACCESS_ABOUT");?> <mark><?php echo getServerPath(); ?>#Sonarr</mark></p>
-                                                        
-                                                        <h4><strong><?php echo $language->translate("SIDE_BY_SIDE");?></strong></h4>
-                                                        
-                                                        <p><?php echo $language->translate("SIDE_BY_SIDE_ABOUT");?></p>
-                                                        
-                                                        <ul>
-                                                        
-                                                            <li><?php echo $language->translate("SIDE_BY_SIDE_INSTRUCTIONS1");?></li>
-                                                            <li><?php echo $language->translate("SIDE_BY_SIDE_INSTRUCTIONS2");?> [<i class='mdi mdi-refresh'></i>]</li>
-                                                            <li><?php echo $language->translate("SIDE_BY_SIDE_INSTRUCTIONS3");?></li>
-                                                        
-                                                        </ul>
+                                                                        </ul>
 
-                                                        <h4><strong><?php echo $language->translate("KEYBOARD_SHORTCUTS");?></strong></h4>
-                                                    
-                                                        <p><?php echo $language->translate("KEYBOARD_SHORTCUTS_ABOUT");?></p>
-                                                        
-                                                        <ul>
+                                                                    </div>
+                                                            
+                                                                </div>
                                                             
-                                                            <li><keyboard class="key"><span>S</span></keyboard> + <keyboard class="key"><span>S</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS1");?></li>
-                                                            <li><keyboard class="key wide"><span>Ctrl</span></keyboard> + <keyboard class="key wide"><span>Shift</span></keyboard> + <keyboard class="key"><span>&darr;</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS2");?></li>
-                                                            <li><keyboard class="key wide"><span>Ctrl</span></keyboard> + <keyboard class="key wide"><span>Shift</span></keyboard> + <keyboard class="key"><span>&uarr;</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS3");?></li>
-                                                            <li><keyboard class="key wide"><span>Esc</span></keyboard> + <keyboard class="key wide"><span>Esc</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS4");?></li>
+                                                            </div>
                                                             
-                                                        </ul>
-                                                        
-                                                        <h4><strong><?php echo $language->translate("TAB_NOT_LOADING");?></strong></h4>
-                                                        
-                                                        <p><?php echo $language->translate("TAB_NOT_LOADING_ABOUT");?></p>
+                                                            <div style="color: <?php echo $topbartext;?> !important; background: <?php echo $topbar;?> !important;" class="panel panel-default">
+                                                            
+                                                                <div class="panel-heading" role="tab" id="headingFour">
+                                                            
+                                                                    <h4 class="panel-title" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
+                                                            
+                                                                        <?php echo $language->translate("KEYBOARD_SHORTCUTS");?>
+                                                            
+                                                                    </h4>
+                                                            
+                                                                </div>
+                                                            
+                                                                <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour" aria-expanded="true">
+                                                            
+                                                                    <div class="panel-body">
+                                                                
+                                                                        <p><?php echo $language->translate("KEYBOARD_SHORTCUTS_ABOUT");?></p>
                                                         
-                                                        <?php 
-                                                        if(get_browser_name() == "Chrome") : echo get_browser_name() . ": <a href='https://chrome.google.com/webstore/detail/ignore-x-frame-headers/gleekbfjekiniecknbkamfmkohkpodhe' target='_blank'><strong>Ignore X-Frame headers</strong> by Guillaume Ryder</a>";
-                                                        elseif(get_browser_name() == "Firefox") : echo get_browser_name() . ": <a href='https://addons.mozilla.org/en-us/firefox/addon/ignore-x-frame-options/' target='_blank'><strong>Ignore X-Frame headers</strong> by rjhoukema</a>";
-                                                        else : echo "Sorry, currently there is no other alternative for " . get_browser_name(); endif;
-                                                        ?>
+                                                                        <ul>
+
+                                                                            <li><keyboard class="key"><span>S</span></keyboard> + <keyboard class="key"><span>S</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS1");?></li>
+                                                                            <li><keyboard class="key"><span>F</span></keyboard> + <keyboard class="key"><span>F</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS6");?></li>
+                                                                            <li><keyboard class="key"><span>P</span></keyboard> + <keyboard class="key"><span>P</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS7");?></li>
+                                                                            <li><keyboard class="key"><span>M</span></keyboard> + <keyboard class="key"><span>M</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS8");?></li>
+                                                                            <li><keyboard class="key wide"><span>Ctrl</span></keyboard> + <keyboard class="key wide"><span>Shift</span></keyboard> + <keyboard class="key"><span>&darr;</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS2");?></li>
+                                                                            <li><keyboard class="key wide"><span>Ctrl</span></keyboard> + <keyboard class="key wide"><span>Shift</span></keyboard> + <keyboard class="key"><span>&uarr;</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS3");?></li>
+                                                                            <li><keyboard class="key wide"><span>Ctrl</span></keyboard> + <keyboard class="key wide"><span>Shift</span></keyboard> + <keyboard class="key"><span>1</span></keyboard> - <keyboard class="key"><span>9</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS5");?></li>
+                                                                            <li><keyboard class="key wide"><span>Esc</span></keyboard> + <keyboard class="key wide"><span>Esc</span></keyboard> <?php echo $language->translate("KEYBOARD_INSTRUCTIONS4");?></li>
+
+
+                                                                        </ul>
+
+                                                                    </div>
+                                                            
+                                                                </div>
+                                                            
+                                                            </div>
+                                                            
+                                                            <div style="color: <?php echo $topbartext;?> !important; background: <?php echo $topbar;?> !important;" class="panel panel-default">
+                                                            
+                                                                <div class="panel-heading" role="tab" id="headingFive">
+                                                            
+                                                                    <h4 class="panel-title" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
+                                                            
+                                                                        <?php echo $language->translate("TAB_NOT_LOADING");?>
+                                                            
+                                                                    </h4>
+                                                            
+                                                                </div>
+                                                            
+                                                                <div id="collapseFive" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFive" aria-expanded="true">
+                                                            
+                                                                    <div class="panel-body">
+                                                                
+                                                                        <p><?php echo $language->translate("TAB_NOT_LOADING_ABOUT");?></p>
                                                         
+                                                                        <?php 
+                                                                        if(get_browser_name() == "Chrome") : echo get_browser_name() . ": <a href='https://chrome.google.com/webstore/detail/ignore-x-frame-headers/gleekbfjekiniecknbkamfmkohkpodhe' target='_blank'><strong>Ignore X-Frame headers</strong> by Guillaume Ryder</a>";
+                                                                        elseif(get_browser_name() == "Firefox") : echo get_browser_name() . ": <a href='https://addons.mozilla.org/en-us/firefox/addon/ignore-x-frame-options/' target='_blank'><strong>Ignore X-Frame headers</strong> by rjhoukema</a>";
+                                                                        else : echo "Sorry, currently there is no other alternative for " . get_browser_name(); endif;
+                                                                        ?>
+
+                                                                    </div>
+                                                            
+                                                                </div>
+                                                            
+                                                            </div>
+                                                            
+                                                            <div style="color: <?php echo $topbartext;?> !important; background: <?php echo $topbar;?> !important;" class="panel panel-default">
+                                                            
+                                                                <div class="panel-heading" role="tab" id="headingSix">
+                                                            
+                                                                    <h4 class="panel-title" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
+                                                            
+                                                                        <?php echo $language->translate("USER_ICONS");?>
+                                                            
+                                                                    </h4>
+                                                            
+                                                                </div>
+                                                            
+                                                                <div id="collapseSix" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSix" aria-expanded="true">
+                                                            
+                                                                    <div class="panel-body">
+                                                                
+                                                                        <p><?php echo $language->translate("USER_ICONS_ABOUT");?> <a href="http://gravatar.com" target="_blank">gravatar.com</a></p>
+
+                                                                    </div>
+                                                            
+                                                                </div>
+                                                            
+                                                            </div>
+                                                            
+                                                            <div style="color: <?php echo $topbartext;?> !important; background: <?php echo $topbar;?> !important;" class="panel panel-default">
+                                                            
+                                                                <div class="panel-heading" role="tab" id="headingSeven">
+                                                            
+                                                                    <h4 class="panel-title" style="text-decoration: none;" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSeven" aria-expanded="true" aria-controls="collapseSeven">
+                                                            
+                                                                        <?php echo $language->translate("TRANSLATIONS");?>
+                                                            
+                                                                    </h4>
+                                                            
+                                                                </div>
+                                                            
+                                                                <div id="collapseSeven" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSeven" aria-expanded="true">
+                                                            
+                                                                    <div class="panel-body">
+                                                                
+                                                                        <p><?php echo $language->translate("TRANSLATIONS_ABOUT");?> <a href="https://github.com/causefx/Organizr/tree/develop/lang" target="_blank">Github Develop Branch</a></p>
+
+                                                                    </div>
+                                                            
+                                                                </div>
+                                                            
+                                                            </div>
+                                                            
+                                                        </div>
+
                                                     </div>
                                                     
                                                     <div class="modal-footer">
@@ -1484,6 +1657,14 @@ endif;
                                                     <input name="topbartext" id="topbartext" class="form-control jscolor {hash:true}" value="<?=$topbartext;?>">
 
                                                 </div>
+                                                
+                                                <div class="col-md-2 gray-bg">
+
+                                                    <center><?php echo $language->translate("LOADING_COLOR");?></center>
+
+                                                    <input name="loading" id="loading" class="form-control jscolor {hash:true}" value="<?=$loading;?>">
+
+                                                </div>
 
                                             </div>
 
@@ -1524,6 +1705,14 @@ endif;
                                                     <input name="hoverbg" id="hoverbg" class="form-control jscolor {hash:true}" value="<?=$hoverbg;?>">
 
                                                 </div>
+                                                
+                                                <div class="col-md-2 gray-bg">
+
+                                                    <center><?php echo $language->translate("HOVER_TEXT");?></center>
+
+                                                    <input name="hovertext" id="hovertext" class="form-control jscolor {hash:true}" value="<?=$hovertext;?>">
+
+                                                </div>
 
                                             </div>
 
@@ -2162,6 +2351,7 @@ endif;
         $( document ).ready(function() {
             
             $("div[class^='DTTT_container']").append('<form style="display: inline; margin-left: 3px;" id="deletelog" method="post"><input type="hidden" name="action" value="deleteLog" /><button class="btn waves btn-labeled btn-danger text-uppercase waves-effect waves-float" type="submit"><span class="btn-label"><i class="fa fa-trash"></i></span><?php echo $language->translate("PURGE_LOG");?> </button></form>')
+            $("a[id^='ToolTables_datatable_0'] span").html('<?php echo $language->translate("PRINT");?>')
             
             $('[data-toggle="tooltip"]').tooltip(); 
             
@@ -2176,7 +2366,7 @@ endif;
                 dataType: "json",
                 success: function(github) {
                    
-                    var currentVersion = "0.9999";
+                    var currentVersion = "0.99991";
                     var githubVersion = github.tag_name;
                     var githubDescription = github.body;
                     var githubName = github.name;

updatedb.php

@@ -0,0 +1,117 @@
+<?php 
+
+date_default_timezone_set('America/Los_Angeles');
+
+$data = false;
+
+ini_set("display_errors", 1);
+ini_set("error_reporting", E_ALL | E_STRICT);
+
+function registration_callback($username, $email, $userdir)
+{
+    global $data;
+    $data = array($username, $email, $userdir);
+}
+
+require_once("user.php");
+$USER = new User("registration_callback");
+
+function checkDatabase($type, $table, $check) {
+    
+    if ($type == "PRAGMA") :
+    
+        $query = 'PRAGMA table_info(' . $table . ')';
+    
+    elseif ($type == "SELECT") :
+    
+        $query = 'SELECT name FROM sqlite_master WHERE type="table" AND name="' . $table . '"';
+    
+    endif;
+    
+    $dbfile = DATABASE_LOCATION  . constant('User::DATABASE_NAME') . ".db";
+    $file_db = new PDO("sqlite:" . $dbfile);
+    $file_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    $runQuery = $file_db->query($query);
+    $buildArray = array();
+    
+    foreach($runQuery as $row) :
+    
+        array_push($buildArray, $row['name']);
+    
+    endforeach;
+    
+    $file_db = null;
+    
+    if (in_array($check, $buildArray)) :
+
+            $found = '<div class="panel panel-success"><div class="panel-heading"><h3 class="panel-title">'. $check . '</h3></div><div style="color: gray" class="panel-body">' . $check . ' was found in ' . $table . ' and is Good 2 Go!</div></div>'; 
+
+        elseif (!in_array($check, $buildArray)) :
+    
+            $found = '<div class="panel panel-danger"><div class="panel-heading"><h3 class="panel-title">'. $check . '</h3></div><div style="color: gray" class="panel-body">' . $check . ' was not found in ' . $table . ' and is being added now!</div></div>'; 
+            
+            if ($type == "PRAGMA") :
+                $file_db = new PDO("sqlite:" . $dbfile);
+                $file_db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+                $count = $file_db->exec("ALTER TABLE `$table` ADD COLUMN `$check` TEXT");
+                $file_db = null;
+            endif;
+    
+    endif;
+    
+    echo $found;
+    
+}
+?>
+
+<html lang="en" class="no-js">
+
+    <head>
+        
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="msapplication-tap-highlight" content="no" />
+
+        <title>Database Upgrade</title>
+
+        <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
+        <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css">
+        <link rel="stylesheet" href="bower_components/mdi/css/materialdesignicons.min.css">
+        <link rel="stylesheet" href="bower_components/metisMenu/dist/metisMenu.min.css">
+        <link rel="stylesheet" href="bower_components/Waves/dist/waves.min.css"> 
+        <link rel="stylesheet" href="bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css"> 
+
+        <link rel="stylesheet" href="js/selects/cs-select.css">
+        <link rel="stylesheet" href="js/selects/cs-skin-elastic.css">
+
+
+        <link rel="stylesheet" href="css/style.css">
+        
+    </head>
+
+    <body class="gray-bg" style="padding: 0;">
+
+        <div id="main-wrapper" class="main-wrapper">
+
+            <!--Content-->
+            <div id="content"  style="margin:0 20px; overflow:hidden">
+                
+                <h1><center>Database Upgrade</center></h1>
+                
+                <?php
+                
+                checkDatabase('SELECT', 'options', 'options');
+                checkDatabase('SELECT', 'tabs', 'tabs');
+                checkDatabase('PRAGMA', 'options', 'loading');
+                checkDatabase('PRAGMA', 'options', 'hovertext');
+
+                ?>
+
+            </div>
+
+        </div>
+
+    </body>
+
+</html>

user.php

@@ -13,6 +13,7 @@
     if(!empty($databaseConfig['timezone'])) : define('TIMEZONE', $databaseConfig['timezone']); else : define('TIMEZONE', 'America/Los_Angeles'); endif;
     if(!empty($databaseConfig['titleLogo'])) : define('TITLELOGO', $databaseConfig['titleLogo']); else : define('TITLELOGO', ''); endif;
     if(!empty($databaseConfig['loadingIcon'])) : define('LOADINGICON', $databaseConfig['loadingIcon']); else : define('LOADINGICON', ''); endif;
+    if(!empty($databaseConfig['multipleLogin'])) : define('MULTIPLELOGIN', $databaseConfig['multipleLogin']); else : define('MULTIPLELOGIN', 'false'); endif;
     define('FAIL_LOG', 'loginLog.json');
     date_default_timezone_set(TIMEZONE);
 
@@ -461,33 +462,45 @@ EOT;
             
 			// logged in, but do the tokens match?
 			$token = $this->get_user_token($username);
-            if(isset($_COOKIE["Organizr"])){
+
+            if(MULTIPLELOGIN == "false"){
             
-                if($_COOKIE["Organizr"] == $token){
-                    
-                    return true;
-                    
+                if(isset($_COOKIE["Organizr"])){
+
+                    if($_COOKIE["Organizr"] == $token){
+
+                        return true;
+
+                    }else{
+
+                        $this->error("cookie token mismatch for $username");
+                        unset($_COOKIE['Organizr']);
+                        setcookie('Organizr', '', time() - 3600, '/');
+                        unset($_COOKIE['OrganizrU']);
+                        setcookie('OrganizrU', '', time() - 3600, '/');
+                        return false;
+
+                    }
+
                 }else{
+
+                    if($token != $_SESSION["token"]) {
+                        
+                        $this->error("token mismatch for $username");
+                        return false; 
                     
-                    $this->error("cookie token mismatch for $username");
-                    unset($_COOKIE['Organizr']);
-                    setcookie('Organizr', '', time() - 3600, '/');
-                    unset($_COOKIE['OrganizrU']);
-                    setcookie('OrganizrU', '', time() - 3600, '/');
-                    return false;
+                    }
+
+                    // active, using the correct token -> authenticated
+                     return true;
                     
                 }
-            
+                
             }else{
-            
-                if($token != $_SESSION["token"]) {
-                    $this->error("token mismatch for $username");
-                    return false; 
-                }
-            
-                // active, using the correct token -> authenticated
-			     return true;
-            }
+                
+                return true;
+                
+            }    
             
 		}