Small Fixes

Added cookie option for webserver authentication

lang/de.ini

@@ -149,3 +149,4 @@ TRANSLATIONS_ABOUT = "Wir benötigen immer Hilfe bei der Übersetzung. Sollten S
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Hintergrund Ladebildschirm"
 HOVER_TEXT = "Hover Text"
+COOKIE_PASSWORD = "Enter Cookie Password"

lang/en.ini

@@ -148,4 +148,5 @@ 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"
+HOVER_TEXT = "Hover Text"
+COOKIE_PASSWORD = "Enter Cookie Password"

lang/es.ini

@@ -148,4 +148,5 @@ 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"
+HOVER_TEXT = "Hover Text"
+COOKIE_PASSWORD = "Enter Cookie Password"

lang/fr.ini

@@ -149,3 +149,4 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
+COOKIE_PASSWORD = "Enter Cookie Password"

lang/it.ini

@@ -148,4 +148,5 @@ 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"
+HOVER_TEXT = "Hover Text"
+COOKIE_PASSWORD = "Enter Cookie Password"

lang/nl.ini

@@ -148,4 +148,5 @@ 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"
+HOVER_TEXT = "Hover Text"
+COOKIE_PASSWORD = "Enter Cookie Password"

settings.php

@@ -1149,6 +1149,12 @@ endif;
 
                                                     </div>
                                                     
+                                                    <div class="form-group">
+
+                                                        <input type="text" class="form-control material" name="cookiePassword" placeholder="<?php echo $language->translate("COOKIE_PASSWORD");?>" value="<?php echo COOKIEPASSWORD;?>">
+
+                                                    </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">
@@ -2206,6 +2212,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#949494");
                 changeColor("inactivetext", "#B8B8B8");
+                changeColor("loading", "#E49F0C");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2221,6 +2229,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#949494");
                 changeColor("inactivetext", "#B8B8B8");
+                changeColor("loading", "#52B54B");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2236,6 +2246,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#DFE3EE");
                 changeColor("inactivetext", "#DFE3EE");
+                changeColor("loading", "#FFFFFF");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2251,6 +2263,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#5B391E");
                 changeColor("inactivetext", "#5B391E");
+                changeColor("loading", "#5B391E");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2266,6 +2280,8 @@ endif;
                 changeColor("activetabtext", "#464545");
                 changeColor("inactiveicon", "#0CE3AC");
                 changeColor("inactivetext", "#0CE3AC");
+                changeColor("loading", "#FFFFFF");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2281,6 +2297,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#C8C8C8");
                 changeColor("inactivetext", "#C8C8C8");
+                changeColor("loading", "#C8C8C8");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2296,6 +2314,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#FFFFFF");
                 changeColor("inactivetext", "#FFFFFF");
+                changeColor("loading", "#FFFFFF");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2311,6 +2331,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#FFFFFF");
                 changeColor("inactivetext", "#FFFFFF");
+                changeColor("loading", "#FFFFFF");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2326,6 +2348,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#66D9EF");
                 changeColor("inactivetext", "#66D9EF");
+                changeColor("loading", "#66D9EF");
+                changeColor("hovertext", "#000000");
                 
             });
             
@@ -2341,6 +2365,8 @@ endif;
                 changeColor("activetabtext", "#FFFFFF");
                 changeColor("inactiveicon", "#949494");
                 changeColor("inactivetext", "#B8B8B8");
+                changeColor("loading", "#CCCCCC");
+                changeColor("hovertext", "#000000");
 
             });
         
@@ -2366,7 +2392,7 @@ endif;
                 dataType: "json",
                 success: function(github) {
                    
-                    var currentVersion = "0.99991";
+                    var currentVersion = "0.99992";
                     var githubVersion = github.tag_name;
                     var githubDescription = github.body;
                     var githubName = github.name;

updatedb.php

@@ -99,6 +99,8 @@ function checkDatabase($type, $table, $check) {
                 
                 <h1><center>Database Upgrade</center></h1>
                 
+                <h5 id="countdown"></h5>
+                
                 <?php
                 
                 checkDatabase('SELECT', 'options', 'options');
@@ -111,6 +113,17 @@ function checkDatabase($type, $table, $check) {
             </div>
 
         </div>
+        
+        <script>
+        
+            (function countdown(remaining) {
+                if(remaining === 0)
+                    location.reload(true);
+                document.getElementById('countdown').innerHTML = "<center>Page will refresh in <strong>" + remaining + "</strong> seconds</center>";
+                setTimeout(function(){ countdown(remaining - 1); }, 1000);
+            })(10);
+        
+        </script>
 
     </body>
 

user.php

@@ -14,6 +14,7 @@
     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;
+    if(!empty($databaseConfig['cookiePassword'])) : define('COOKIEPASSWORD', $databaseConfig['cookiePassword']); else : define('COOKIEPASSWORD', ''); endif;
     define('FAIL_LOG', 'loginLog.json');
     date_default_timezone_set(TIMEZONE);
 
@@ -478,6 +479,8 @@ EOT;
                         setcookie('Organizr', '', time() - 3600, '/');
                         unset($_COOKIE['OrganizrU']);
                         setcookie('OrganizrU', '', time() - 3600, '/');
+                        unset($_COOKIE['cookiePassword']);
+                        setcookie("cookiePassword", '', time() - 3600, '/');
                         return false;
 
                     }
@@ -658,6 +661,7 @@ EOT;
 					$this->info("Welcome $username");
                     file_put_contents(FAIL_LOG, buildLog($username, "good_auth"));
                     chmod(FAIL_LOG, 0660);
+                    setcookie("cookiePassword", COOKIEPASSWORD, time() + (86400 * 7), "/");
                     return true; 
                     
                 }
@@ -710,6 +714,8 @@ EOT;
             setcookie('Organizr', '', time() - 3600, '/');
             unset($_COOKIE['OrganizrU']);
             setcookie('OrganizrU', '', time() - 3600, '/');
+            unset($_COOKIE['cookiePassword']);
+            setcookie("cookiePassword", '', time() - 3600, '/');
 			return true;
 		}