Resolve Merge Conflicts

error.php

@@ -45,13 +45,8 @@ $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");
+require_once("functions.php");
 $USER = new User("registration_callback");
 
 $dbfile = DATABASE_LOCATION.'users.db';

index.php

@@ -29,6 +29,9 @@ $baseURL = "";
 // Load functions
 require_once("functions.php");
 
+//Upgrade Check
+upgradeCheck();
+
 // Get Action
 if(isset($_POST['action'])) {
     $action = $_POST['action'];
@@ -40,6 +43,7 @@ if(!file_exists('config/config.php')) {
 	if($action == "createLocation") {
 		if (isset($_POST['database_Location'])) {
 			$_POST['database_Location'] = str_replace('//','/',$_POST['database_Location'].'/');
+            if(substr($_POST['database_Location'], -1) != "/") : $_POST['database_Location'] = $_POST['database_Location'] . "/"; endif;
 			$_POST['USER_HOME'] = $_POST['database_Location'].'users/';
 		}
 		if (file_exists($_POST['database_Location'])) {
@@ -173,14 +177,12 @@ if (file_exists('config/config.php')) {
 
         else: 
         
-            //$showPic = "<login class='login-btn text-uppercase'>" . $language->translate("MENU") . "</login>";
             $showPic = "<i class=\"mdi mdi-account-box-outline\"></i>";
 
         endif;
 
     else : 
 
-        //$showPic = "<img style='height: " . $userSize . "px'; src='images/login.png'>"; 
         $showPic = "<login class='login-btn text-uppercase'>" . $language->translate("LOGIN") . "</login>"; 
 
     endif;
@@ -232,29 +234,29 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 
         <title><?=$title;?><?php if($title !== "Organizr") :  echo " - Organizr"; endif; ?></title>
 
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/font-awesome/css/font-awesome.min.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/mdi/css/materialdesignicons.min.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/metisMenu/dist/metisMenu.min.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/Waves/dist/waves.min.css"> 
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css"> 
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/bootstrap/dist/css/bootstrap.min.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/font-awesome/css/font-awesome.min.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/mdi/css/materialdesignicons.min.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/metisMenu/dist/metisMenu.min.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/Waves/dist/waves.min.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css?v=<?php echo INSTALLEDVERSION; ?>">
 
-        <link rel="stylesheet" href="<?=$baseURL;?>js/selects/cs-select.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>js/selects/cs-skin-elastic.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/google-material-color/dist/palette.css">
+        <link rel="stylesheet" href="<?=$baseURL;?>js/selects/cs-select.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>js/selects/cs-skin-elastic.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/google-material-color/dist/palette.css?v=<?php echo INSTALLEDVERSION; ?>">
         
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/sweetalert/dist/sweetalert.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/smoke/dist/css/smoke.min.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>js/notifications/ns-style-growl.css">
-        <link rel="stylesheet" href="<?=$baseURL;?>js/notifications/ns-style-other.css">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/sweetalert/dist/sweetalert.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>bower_components/smoke/dist/css/smoke.min.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>js/notifications/ns-style-growl.css?v=<?php echo INSTALLEDVERSION; ?>">
+        <link rel="stylesheet" href="<?=$baseURL;?>js/notifications/ns-style-other.css?v=<?php echo INSTALLEDVERSION; ?>">
 
 
-        <script src="<?=$baseURL;?>js/menu/modernizr.custom.js"></script>
-        <script type="text/javascript" src="<?=$baseURL;?>js/sha1.js"></script>
-		<script type="text/javascript" src="<?=$baseURL;?>js/user.js"></script>
+        <script src="<?=$baseURL;?>js/menu/modernizr.custom.js?v=<?php echo INSTALLEDVERSION; ?>"></script>
+        <script type="text/javascript" src="<?=$baseURL;?>js/sha1.js?v=<?php echo INSTALLEDVERSION; ?>"></script>
+		<script type="text/javascript" src="<?=$baseURL;?>js/user.js?v=<?php echo INSTALLEDVERSION; ?>"></script>
 
         <link rel="stylesheet" href="<?=$baseURL;?>css/style.css?v=<?php echo INSTALLEDVERSION; ?>">
-        <link rel="stylesheet" href="bower_components/animate.css/animate.min.css">
+        <link rel="stylesheet" href="bower_components/animate.css/animate.min.css?v=<?php echo INSTALLEDVERSION; ?>">
 
         <link rel="icon" type="image/png" href="<?=$baseURL;?>images/favicon/android-chrome-192x192.png" sizes="192x192">
         <link rel="apple-touch-icon" sizes="180x180" href="<?=$baseURL;?>images/favicon/apple-touch-icon.png">

lang/de.ini

@@ -233,7 +233,7 @@ AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
 AUTHBACKENDDOMAIN = "Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
-BOTH = "Both"
+BOTH = "Plus Other"
 ONLY = "Only"
 NO_CREATE = "Do Not Create Accounts"
 YES_CREATE = "Create Accounts As Needed"

lang/en.ini

@@ -233,7 +233,7 @@ AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
 AUTHBACKENDDOMAIN = "Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
-BOTH = "Both"
+BOTH = "Plus Other"
 ONLY = "Only"
 NO_CREATE = "Do Not Create Accounts"
 YES_CREATE = "Create Accounts As Needed"

lang/es.ini

@@ -233,7 +233,7 @@ AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
 AUTHBACKENDDOMAIN = "Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
-BOTH = "Both"
+BOTH = "Plus Other"
 ONLY = "Only"
 NO_CREATE = "Do Not Create Accounts"
 YES_CREATE = "Create Accounts As Needed"

lang/fr.ini

@@ -233,7 +233,7 @@ AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
 AUTHBACKENDDOMAIN = "Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
-BOTH = "Both"
+BOTH = "Plus Other"
 ONLY = "Only"
 NO_CREATE = "Do Not Create Accounts"
 YES_CREATE = "Create Accounts As Needed"

lang/it.ini

@@ -233,7 +233,7 @@ AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
 AUTHBACKENDDOMAIN = "Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
-BOTH = "Both"
+BOTH = "Plus Other"
 ONLY = "Only"
 NO_CREATE = "Do Not Create Accounts"
 YES_CREATE = "Create Accounts As Needed"

lang/nl.ini

@@ -233,7 +233,7 @@ AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
 AUTHBACKENDDOMAIN = "Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
-BOTH = "Both"
+BOTH = "Plus Other"
 ONLY = "Only"
 NO_CREATE = "Do Not Create Accounts"
 YES_CREATE = "Create Accounts As Needed"

lang/pl.ini

@@ -233,7 +233,7 @@ AUTHBACKENDPORT = "Backend Port (eg 21 for FTP, 389 for LDAP, 8096 for Emby)"
 AUTHBACKENDDOMAIN = "Domain to use for LDAP"
 PLEX_USERNAME = "Plex Username"
 PLEX_PASSWORD = "Plex Password"
-BOTH = "Both"
+BOTH = "Plus Other"
 ONLY = "Only"
 NO_CREATE = "Do Not Create Accounts"
 YES_CREATE = "Create Accounts As Needed"

settings.php

@@ -656,6 +656,7 @@ if(SLIMBAR == "true") : $slimBar = "30"; $userSize = "25"; else : $slimBar = "56
                 border: solid;
                 border-bottom: 0;
                 border-radius: 5px;
+                top: 3px;
 }<?php if(CUSTOMCSS == "true") : 
 $template_file = "custom.css";
 $file_handle = fopen($template_file, "rb");
@@ -695,7 +696,7 @@ endif; ?>
 
                             <div class="profile-usermenu">
 
-                                <ul class="nav">
+                                <ul class="nav" id="settings-list">
 
                                     <li class=""><a id="open-tabs"><i class="fa fa-list red-orange"></i>Edit Tabs</a></li>
                                     <li class=""><a id="open-colors"><i class="fa fa-paint-brush green"></i>Edit Colors</a></li>
@@ -1269,7 +1270,7 @@ endif;?></textarea>
 							    
                                                         <li class="apps">
 
-                                                            <a href="#tab-emby" data-toggle="tab" aria-expanded="true"><img style="height:40px; width:40px;" src="images/emby.png"></a>
+                                                            <a href="#tab-emby" data-toggle="tab" aria-expanded="false"><img style="height:40px; width:40px;" src="images/emby.png"></a>
 
                                                         </li>
 
@@ -1708,214 +1709,281 @@ endif;?></textarea>
                                                 <form class="content-form" name="systemSettings" id="systemSettings" action="" method="POST">
                         								    
                                                     <input type="hidden" name="action" value="createLocation" />
-							
-                                                    <div class="form-group" style="background-color: #fafafa; border: 2px solid black; border-radius: 5px; padding: 5px; margin: 5px;">
-														<select id="authType" name="authType" class="form-control material input-sm" required>
-															<option value="internal" <?php echo (AUTHTYPE=='internal' || !AUTHTYPE?'selected':''); ?>>Organizr <?php echo $language->translate("ONLY"); ?></option>
-															<!--<option value="external" <?php echo (AUTHTYPE=='external'?'selected':''); ?>>External Only</option>-->
-															<option value="both" <?php echo (AUTHTYPE=='both'?'selected':''); ?>><?php echo $language->translate("BOTH"); ?></option>
-														</select>
-														<p class="help-text"><?php echo $language->translate("AUTHTYPE"); ?></p>
-														
-														<select id="authBackend" name="authBackend" class="form-control material input-sm" required>
-															<?php
-																$backendFunctions = array_filter(get_defined_functions()['user'],function($v) { return strpos($v, 'plugin_auth_') === 0; });
-																foreach ($backendFunctions as $value) {
-																	$name = str_replace('plugin_auth_','',$value);
-																	echo '<option value="'.$name.'" '.(AUTHBACKEND==$name?'selected':'').'>'.ucwords(str_replace('_',' ',$name)).'</option>';
-																}
-															?>
-														</select>
-														<p class="help-text"><?php echo $language->translate("AUTHBACKEND"); ?></p>
-														
-														<select id="authBackendCreate" name="authBackendCreate" class="form-control material input-sm" required>
-															<option value="false" <?php echo (AUTHBACKENDCREATE=='false' || !AUTHBACKENDCREATE?'selected':''); ?>><?php echo $language->translate("NO_CREATE"); ?></option>
-															<option value="true" <?php echo (AUTHBACKENDCREATE=='true'?'selected':''); ?>><?php echo $language->translate("YES_CREATE"); ?></option>
-														</select>
-														<p class="help-text"><?php echo $language->translate("AUTHBACKENDCREATE"); ?></p>
-														
-														<input type="text" class="form-control material input-sm" name="authBackendHost" placeholder="<?php echo $language->translate("AUTHBACKENDHOST");?>" autocorrect="off" autocapitalize="off" value="<?php echo AUTHBACKENDHOST;?>">
-                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKENDHOST");?></p>
-														
-														<input type="text" class="form-control material input-sm" name="authBackendPort" placeholder="<?php echo $language->translate("AUTHBACKENDPORT");?>" autocorrect="off" autocapitalize="off" value="<?php echo AUTHBACKENDPORT;?>">
-                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKENDPORT");?></p>
-														
-														<input type="text" class="form-control material input-sm" name="authBackendDomain" placeholder="<?php echo $language->translate("AUTHBACKENDDOMAIN");?>" autocorrect="off" autocapitalize="off" value="<?php echo AUTHBACKENDDOMAIN;?>">
-                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKENDDOMAIN");?></p>
-														
-														<input type="text" class="form-control material input-sm" name="embyToken" placeholder="<?php echo $language->translate("EMBY_TOKEN");?>" autocorrect="off" autocapitalize="off" value="<?php echo EMBYTOKEN;?>">
-														<p class="help-text"><?php echo $language->translate("EMBY_TOKEN");?></p>
-                                                        
-                                                        <input type="text" class="form-control material input-sm" name="plexUsername" placeholder="<?php echo $language->translate("PLEX_USERNAME");?>" autocorrect="off" autocapitalize="off" value="<?php echo PLEXUSERNAME;?>">
-														<p class="help-text"><?php echo $language->translate("PLEX_USERNAME");?></p>
-                                                        
-                                                        <input type="password" class="form-control material input-sm" name="plexPassword" placeholder="<?php echo $language->translate("PLEX_PASSWORD");?>" autocorrect="off" autocapitalize="off" value="<?php echo PLEXPASSWORD;?>">
-														<p class="help-text"><?php echo $language->translate("PLEX_PASSWORD");?></p>
-                                                    </div>
-							
-                                                    <div class="form-group">
+                                                    
+                                                    <div class="tabbable tabs-with-bg" id="advanced-settings-tabs">
 
-                                                        <input type="text" class="form-control material input-sm" name="databaseLocation" placeholder="<?php echo $language->translate("DATABASE_PATH");?>" autocorrect="off" autocapitalize="off" value="<?php echo DATABASE_LOCATION;?>">
-                                                        <p class="help-text"><?php echo $language->translate("DATABASE_PATH");?></p>
+                                                        <ul class="nav nav-tabs apps">
 
-                                                    </div>
+                                                            <li class="apps active">
 
-                                                    <div class="form-group">
+                                                                <a href="#tab-security" data-toggle="tab" aria-expanded="true"><img style="height:40px; width:40px;" src="images/security.png"></a>
 
-                                                        <?php echo gotTimezone();?>
-                                                        <p class="help-text"><?php echo $language->translate("SET_TIMEZONE");?></p>
+                                                            </li>
 
-                                                    </div>
+                                                            <li class="apps">
 
-                                                    <div class="form-group">
+                                                                <a href="#tab-more-settings" data-toggle="tab" aria-expanded="false"><img style="height:40px; width:40px;" src="images/gear.png"></a>
 
-                                                        <input type="text" class="form-control material input-sm" name="titleLogo" placeholder="<?php echo $language->translate("LOGO_URL_TITLE");?>" value="<?php echo TITLELOGO;?>">
-                                                        <p class="help-text"><?php echo $language->translate("LOGO_URL_TITLE");?></p>
+                                                            </li>
 
-                                                    </div>
+                                                            <li class="apps">
 
-                                                    <div class="form-group">
+                                                                <a href="#tab-mail" data-toggle="tab" aria-expanded="false"><img style="height:40px; width:40px;" src="images/mail.png"></a>
 
-                                                        <input type="text" class="form-control material input-sm" name="loadingIcon" placeholder="<?php echo $language->translate("LOADING_ICON_URL");?>" value="<?php echo LOADINGICON;?>">
-                                                        <p class="help-text"><?php echo $language->translate("LOADING_ICON_URL");?></p>
+                                                            </li>
 
-                                                    </div>
-                                                    
-                                                    <div class="form-group">
+                                                            <li class="apps">
 
-                                                        <input type="text" class="form-control material input-sm" name="cookiePassword" placeholder="<?php echo $language->translate("COOKIE_PASSWORD");?>" value="<?php echo COOKIEPASSWORD;?>">
-                                                        <p class="help-text"><?php echo $language->translate("COOKIE_PASSWORD");?></p>
+                                                                <a href="#tab-more-custom" data-toggle="tab" aria-expanded="false"><img style="height:40px; width:40px;" src="images/paint.png"></a>
 
-                                                    </div>
-                                                    
-                                                    <div class="form-group">
+                                                            </li>
 
-                                                        <input type="text" class="form-control material input-sm" name="domain" placeholder="<?php echo $language->translate("COOKIE_DOMAIN");?>" value="<?php echo DOMAIN;?>">
-                                                        <p class="help-text"><?php echo $language->translate("COOKIE_DOMAIN");?></p>
+                                                        </ul>
+                                                        
+                                                        <div class="tab-content">
 
-                                                    </div>
-                                                    
-                                                    <div class="form-group">
+                                                            <div class="tab-pane big-box fade active in" id="tab-security">
+                                                                
+                                                                <div class="form-group">
+                                                                    <select id="authType" name="authType" class="form-control material input-sm" required>
+                                                                        <option value="internal" <?php echo (AUTHTYPE=='internal' || !AUTHTYPE?'selected':''); ?>>Organizr <?php echo $language->translate("ONLY"); ?></option>
+                                                                        <!--<option value="external" <?php echo (AUTHTYPE=='external'?'selected':''); ?>>External Only</option>-->
+                                                                        <option value="both" <?php echo (AUTHTYPE=='both'?'selected':''); ?>>Organizr <?php echo $language->translate("BOTH"); ?></option>
+                                                                    </select>
+                                                                    <p class="help-text"><?php echo $language->translate("AUTHTYPE"); ?></p>
+                                                                    <group id="host-selected">
+                                                                        <select id="authBackend" name="authBackend" class="form-control material input-sm" required>
+                                                                            <?php
+                                                                                $backendFunctions = array_filter(get_defined_functions()['user'],function($v) { return strpos($v, 'plugin_auth_') === 0; });
+                                                                                foreach ($backendFunctions as $value) {
+                                                                                    $name = str_replace('plugin_auth_','',$value);
+                                                                                    echo '<option value="'.$name.'" '.(AUTHBACKEND==$name?'selected':'').'>'.ucwords(str_replace('_',' ',$name)).'</option>';
+                                                                                }
+                                                                            ?>
+                                                                        </select>
+                                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKEND"); ?></p>
+
+                                                                        <select id="authBackendCreate" name="authBackendCreate" class="form-control material input-sm" required>
+                                                                            <option value="false" <?php echo (AUTHBACKENDCREATE=='false' || !AUTHBACKENDCREATE?'selected':''); ?>><?php echo $language->translate("NO_CREATE"); ?></option>
+                                                                            <option value="true" <?php echo (AUTHBACKENDCREATE=='true'?'selected':''); ?>><?php echo $language->translate("YES_CREATE"); ?></option>
+                                                                        </select>
+                                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKENDCREATE"); ?></p>
+                                                                    </group>
+                                                                    <group id="host-other">
+                                                                        <input type="text" class="form-control material input-sm" name="authBackendHost" placeholder="<?php echo $language->translate("AUTHBACKENDHOST");?>" autocorrect="off" autocapitalize="off" value="<?php echo AUTHBACKENDHOST;?>">
+                                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKENDHOST");?></p>
+
+                                                                        <input type="text" class="form-control material input-sm" name="authBackendPort" placeholder="<?php echo $language->translate("AUTHBACKENDPORT");?>" autocorrect="off" autocapitalize="off" value="<?php echo AUTHBACKENDPORT;?>">
+                                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKENDPORT");?></p>
+                                                                    </group>
+                                                                    <group id="host-ldap">
+                                                                        <input type="text" class="form-control material input-sm" name="authBackendDomain" placeholder="<?php echo $language->translate("AUTHBACKENDDOMAIN");?>" autocorrect="off" autocapitalize="off" value="<?php echo AUTHBACKENDDOMAIN;?>">
+                                                                        <p class="help-text"><?php echo $language->translate("AUTHBACKENDDOMAIN");?></p>
+                                                                    </group>
+                                                                    <group id="host-emby">
+                                                                        <input type="text" class="form-control material input-sm" name="embyToken" placeholder="<?php echo $language->translate("EMBY_TOKEN");?>" autocorrect="off" autocapitalize="off" value="<?php echo EMBYTOKEN;?>">
+                                                                        <p class="help-text"><?php echo $language->translate("EMBY_TOKEN");?></p>
+                                                                    </group>
+                                                                    <group id="host-plex">
+                                                                        <input type="text" class="form-control material input-sm" name="plexUsername" placeholder="<?php echo $language->translate("PLEX_USERNAME");?>" autocorrect="off" autocapitalize="off" value="<?php echo PLEXUSERNAME;?>">
+                                                                        <p class="help-text"><?php echo $language->translate("PLEX_USERNAME");?></p>
+
+                                                                        <input type="password" class="form-control material input-sm" name="plexPassword" placeholder="<?php echo $language->translate("PLEX_PASSWORD");?>" autocorrect="off" autocapitalize="off" value="<?php echo PLEXPASSWORD;?>">
+                                                                        <p class="help-text"><?php echo $language->translate("PLEX_PASSWORD");?></p>
+                                                                    </group>
+                                                                </div>
+                                                                
+                                                                <hr>
+                                                                
+                                                                <div class="form-group">
 
-                                                        <input type="text" class="form-control material input-sm" name="registerPassword" placeholder="<?php echo $language->translate("REGISTER_PASSWORD");?>" value="<?php echo REGISTERPASSWORD;?>">
-                                                        <p class="help-text"><?php echo $language->translate("REGISTER_PASSWORD");?></p>
+                                                                    <input type="text" class="form-control material input-sm" name="cookiePassword" placeholder="<?php echo $language->translate("COOKIE_PASSWORD");?>" value="<?php echo COOKIEPASSWORD;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("COOKIE_PASSWORD");?></p>
 
-                                                    </div>
-                                                    
-                                                    <div class="form-group">
+                                                                </div>
 
-                                                        <input type="text" class="form-control material input-sm" name="smtpHost" placeholder="<?php echo $language->translate("SMTP_HOST");?>" value="<?php echo SMTPHOST;?>">
-                                                        <p class="help-text"><?php echo $language->translate("SMTP_HOST");?></p>
-                                                        
-                                                        <input type="text" class="form-control material input-sm" name="smtpHostPort" placeholder="<?php echo $language->translate("SMTP_HOST_PORT");?>" value="<?php echo SMTPHOSTPORT;?>">
-                                                        <p class="help-text"><?php echo $language->translate("SMTP_HOST_PORT");?></p>
-                                                        
-                                                        <input type="text" class="form-control material input-sm" name="smtpHostAuth" placeholder="<?php echo $language->translate("SMTP_HOST_AUTH");?>" value="<?php echo SMTPHOSTAUTH;?>">
-                                                        <p class="help-text"><?php echo $language->translate("SMTP_HOST_AUTH");?></p>
-                                                        
-                                                        <input type="text" class="form-control material input-sm" name="smtpHostUsername" placeholder="<?php echo $language->translate("SMTP_HOST_USERNAME");?>" value="<?php echo SMTPHOSTUSERNAME;?>">
-                                                        <p class="help-text"><?php echo $language->translate("SMTP_HOST_USERNAME");?></p>
-                                                        
-                                                        <input type="text" class="form-control material input-sm" name="smtpHostPassword" placeholder="<?php echo $language->translate("SMTP_HOST_PASSWORD");?>" value="<?php echo SMTPHOSTPASSWORD;?>">
-                                                        <p class="help-text"><?php echo $language->translate("SMTP_HOST_PASSWORD");?></p>
-                                                        
-                                                        <input type="text" class="form-control material input-sm" name="smtpHostSenderName" placeholder="<?php echo $language->translate("SMTP_HOST_SENDER_NAME");?>" value="<?php echo SMTPHOSTSENDERNAME;?>">
-                                                        <p class="help-text"><?php echo $language->translate("SMTP_HOST_SENDER_NAME");?></p>
-                                                        
-                                                        <input type="text" class="form-control material input-sm" name="smtpHostSenderEmail" placeholder="<?php echo $language->translate("SMTP_HOST_SENDER_EMAIL");?>" value="<?php echo SMTPHOSTSENDEREMAIL;?>">
-                                                        <p class="help-text"><?php echo $language->translate("SMTP_HOST_SENDER_EMAIL");?></p>
+                                                                <div class="form-group">
 
-                                                    </div>
+                                                                    <input type="text" class="form-control material input-sm" name="domain" placeholder="<?php echo $language->translate("COOKIE_DOMAIN");?>" value="<?php echo DOMAIN;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("COOKIE_DOMAIN");?></p>
+
+                                                                </div>
+
+                                                                <div class="form-group">
+
+                                                                    <input type="text" class="form-control material input-sm" name="registerPassword" placeholder="<?php echo $language->translate("REGISTER_PASSWORD");?>" value="<?php echo REGISTERPASSWORD;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("REGISTER_PASSWORD");?></p>
+
+                                                                </div>
+                                                                
+                                                                <div class="content-form form-inline">
                                                     
-                                                    <div class="content-form form-inline">
-                                                        
-                                                        <div class="form-group">
+                                                                    <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;?>>
 
-                                                        <?php 
-                                                        
-                                                        if($notifyExplode[1] == "slidetop") : $slidetopActive = "selected"; else : $slidetopActive = ""; endif;
-                                                        if($notifyExplode[1] == "exploader") : $exploaderActive = "selected"; else : $exploaderActive = ""; endif;
-                                                        if($notifyExplode[1] == "flip") : $flipActive = "selected"; else : $flipActive = ""; endif;
-                                                        if($notifyExplode[1] == "bouncyflip") : $bouncyflipActive = "selected"; else : $bouncyflipActive = ""; endif;
-                                                        if($notifyExplode[1] == "scale") : $scaleActive = "selected"; else : $scaleActive = ""; endif;
-                                                        if($notifyExplode[1] == "genie") : $genieActive = "selected"; else : $genieActive = ""; endif;
-                                                        if($notifyExplode[1] == "jelly") : $jellyActive = "selected"; else : $jellyActive = ""; endif;
-                                                        if($notifyExplode[1] == "slide") : $slideActive = "selected"; else : $slideActive = ""; endif;
-                                                        if($notifyExplode[1] == "boxspinner") : $boxspinnerActive = "selected"; else : $boxspinnerActive = ""; endif;
-                                                        if($notifyExplode[1] == "thumbslider") : $thumbsliderActive = "selected"; else : $thumbsliderActive = ""; endif;
-                                                        
-                                                        ?>
-                                                            <select id="notifyValue" name="notifyEffect" id="notifyEffect" class="form-control material input-sm" required>
+                                                                        <label for="multipleLogin"></label><?php echo $language->translate("MULTIPLE_LOGINS");?>
 
-                                                                <option value="bar-slidetop" <?=$slidetopActive;?>>Slide From Top</option>
-                                                                <option value="bar-exploader" <?=$exploaderActive;?>>Exploader From Top</option>
-                                                                <option value="attached-flip" <?=$flipActive;?>>Flip</option>
-                                                                <option value="attached-bouncyflip" <?=$bouncyflipActive;?>>Bouncy Flip</option>
-                                                                <option value="growl-scale" <?=$scaleActive;?>>Growl Scale</option>
-                                                                <option value="growl-genie" <?=$genieActive;?>>Growl Genie</option>
-                                                                <option value="growl-jelly" <?=$jellyActive;?>>Growl Jelly</option>
-                                                                <option value="growl-slide" <?=$slideActive;?>>Growl Slide</option>
-                                                                <option value="other-boxspinner" <?=$boxspinnerActive;?>>Spinning Box</option>
-                                                                <option value="other-thumbslider" <?=$thumbsliderActive;?>>Sliding</option>
+                                                                    </div>
 
-                                                            </select>
+                                                                </div>
+                                                                
+                                                            </div>
+                                                            
+                                                            <div class="tab-pane big-box fade" id="tab-more-settings">
+                                                                
+                                                                <div class="form-group">
 
-                                                            <button id="notifyTest" type="button" class="class='btn waves btn-labeled btn-success btn btn-sm text-uppercase waves-effect waves-float"><span class="btn-label"><i class="fa fa-flask"></i></span><?php echo $language->translate("TEST");?></button>
+                                                                    <input type="text" class="form-control material input-sm" name="databaseLocation" placeholder="<?php echo $language->translate("DATABASE_PATH");?>" autocorrect="off" autocapitalize="off" value="<?php echo DATABASE_LOCATION;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("DATABASE_PATH");?></p>
 
-                                                            <p class="help-text"><?php echo $language->translate("NOTIFICATION_TYPE");?></p>
+                                                                </div>
 
-                                                        </div>
-                                                    
-                                                    </div>
-                                                    
-                                                    <div class="content-form form-inline">
-                                                    
-                                                        <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;?>>
+                                                                <div class="form-group">
 
-                                                            <label for="multipleLogin"></label><?php echo $language->translate("MULTIPLE_LOGINS");?>
+                                                                    <?php echo gotTimezone();?>
+                                                                    <p class="help-text"><?php echo $language->translate("SET_TIMEZONE");?></p>
 
-                                                        </div>
-                                                        
-                                                        <div class="form-group">
-                                                            <?php  if(LOADINGSCREEN == "true") : $loadingScreen = "checked"; else : $loadingScreen = ""; endif;?>
-                                                            <input id="" class="switcher switcher-success" value="false" name="loadingScreen" type="hidden">
-                                                            <input id="loadingScreen" class="switcher switcher-success" value="true" name="loadingScreen" type="checkbox" <?php echo $loadingScreen;?>>
+                                                                </div>
+                                                                
+                                                            </div>
+                                                            
+                                                            <div class="tab-pane big-box fade" id="tab-mail">
+                                                                
+                                                                <div class="form-group">
 
-                                                            <label for="loadingScreen"></label><?php echo $language->translate("ENABLE_LOADING_SCREEN");?>
+                                                                    <input type="text" class="form-control material input-sm" name="smtpHost" placeholder="<?php echo $language->translate("SMTP_HOST");?>" value="<?php echo SMTPHOST;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("SMTP_HOST");?></p>
 
-                                                        </div>
-                                                        
-                                                        <div class="form-group">
-                                                            <?php  if(ENABLEMAIL == "true") : $enableMail = "checked"; else : $enableMail = ""; endif;?>
-                                                            <input id="" class="switcher switcher-success" value="false" name="enableMail" type="hidden">
-                                                            <input id="enableMail" class="switcher switcher-success" value="true" name="enableMail" type="checkbox" <?php echo $enableMail;?>>
+                                                                    <input type="text" class="form-control material input-sm" name="smtpHostPort" placeholder="<?php echo $language->translate("SMTP_HOST_PORT");?>" value="<?php echo SMTPHOSTPORT;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("SMTP_HOST_PORT");?></p>
 
-                                                            <label for="enableMail"></label><?php echo $language->translate("ENABLE_MAIL");?>
+                                                                    <input type="text" class="form-control material input-sm" name="smtpHostAuth" placeholder="<?php echo $language->translate("SMTP_HOST_AUTH");?>" value="<?php echo SMTPHOSTAUTH;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("SMTP_HOST_AUTH");?></p>
 
-                                                        </div>
-                                                        
-                                                        <div class="form-group">
-                                                            <?php  if(SLIMBAR == "true") : $enableSlimBar = "checked"; else : $enableSlimBar = ""; endif;?>
-                                                            <input id="" class="switcher switcher-success" value="false" name="slimBar" type="hidden">
-                                                            <input id="slimBar" class="switcher switcher-success" value="true" name="slimBar" type="checkbox" <?php echo $enableSlimBar;?>>
+                                                                    <input type="text" class="form-control material input-sm" name="smtpHostUsername" placeholder="<?php echo $language->translate("SMTP_HOST_USERNAME");?>" value="<?php echo SMTPHOSTUSERNAME;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("SMTP_HOST_USERNAME");?></p>
 
-                                                            <label for="slimBar"></label><?php echo $language->translate("ENABLE_SLIMBAR");?>
+                                                                    <input type="text" class="form-control material input-sm" name="smtpHostPassword" placeholder="<?php echo $language->translate("SMTP_HOST_PASSWORD");?>" value="<?php echo SMTPHOSTPASSWORD;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("SMTP_HOST_PASSWORD");?></p>
 
-                                                        </div>
+                                                                    <input type="text" class="form-control material input-sm" name="smtpHostSenderName" placeholder="<?php echo $language->translate("SMTP_HOST_SENDER_NAME");?>" value="<?php echo SMTPHOSTSENDERNAME;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("SMTP_HOST_SENDER_NAME");?></p>
+
+                                                                    <input type="text" class="form-control material input-sm" name="smtpHostSenderEmail" placeholder="<?php echo $language->translate("SMTP_HOST_SENDER_EMAIL");?>" value="<?php echo SMTPHOSTSENDEREMAIL;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("SMTP_HOST_SENDER_EMAIL");?></p>
+
+                                                                </div>
+                                                                
+                                                                <div class="content-form form-inline">
+
+                                                                    <div class="form-group">
+                                                                        <?php  if(ENABLEMAIL == "true") : $enableMail = "checked"; else : $enableMail = ""; endif;?>
+                                                                        <input id="" class="switcher switcher-success" value="false" name="enableMail" type="hidden">
+                                                                        <input id="enableMail" class="switcher switcher-success" value="true" name="enableMail" type="checkbox" <?php echo $enableMail;?>>
+
+                                                                        <label for="enableMail"></label><?php echo $language->translate("ENABLE_MAIL");?>
+
+                                                                    </div>
+
+                                                                </div>
+                                                                
+                                                            </div>
+                                                            
+                                                            <div class="tab-pane big-box fade" id="tab-more-custom">
+                                                                
+                                                                <div class="form-group">
+
+                                                                    <input type="text" class="form-control material input-sm" name="titleLogo" placeholder="<?php echo $language->translate("LOGO_URL_TITLE");?>" value="<?php echo TITLELOGO;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("LOGO_URL_TITLE");?></p>
+
+                                                                </div>
+
+                                                                <div class="form-group">
+
+                                                                    <input type="text" class="form-control material input-sm" name="loadingIcon" placeholder="<?php echo $language->translate("LOADING_ICON_URL");?>" value="<?php echo LOADINGICON;?>">
+                                                                    <p class="help-text"><?php echo $language->translate("LOADING_ICON_URL");?></p>
+
+                                                                </div>
+                                                                
+                                                                <div class="content-form form-inline">
                                                         
-                                                        <div class="form-group">
-                                                            <?php  if(GRAVATAR == "true") : $enableGravatar = "checked"; else : $enableGravatar = ""; endif;?>
-                                                            <input id="" class="switcher switcher-success" value="false" name="gravatar" type="hidden">
-                                                            <input id="gravatar" class="switcher switcher-success" value="true" name="gravatar" type="checkbox" <?php echo $enableGravatar;?>>
+                                                                    <div class="form-group">
+
+                                                                    <?php 
+
+                                                                    if($notifyExplode[1] == "slidetop") : $slidetopActive = "selected"; else : $slidetopActive = ""; endif;
+                                                                    if($notifyExplode[1] == "exploader") : $exploaderActive = "selected"; else : $exploaderActive = ""; endif;
+                                                                    if($notifyExplode[1] == "flip") : $flipActive = "selected"; else : $flipActive = ""; endif;
+                                                                    if($notifyExplode[1] == "bouncyflip") : $bouncyflipActive = "selected"; else : $bouncyflipActive = ""; endif;
+                                                                    if($notifyExplode[1] == "scale") : $scaleActive = "selected"; else : $scaleActive = ""; endif;
+                                                                    if($notifyExplode[1] == "genie") : $genieActive = "selected"; else : $genieActive = ""; endif;
+                                                                    if($notifyExplode[1] == "jelly") : $jellyActive = "selected"; else : $jellyActive = ""; endif;
+                                                                    if($notifyExplode[1] == "slide") : $slideActive = "selected"; else : $slideActive = ""; endif;
+                                                                    if($notifyExplode[1] == "boxspinner") : $boxspinnerActive = "selected"; else : $boxspinnerActive = ""; endif;
+                                                                    if($notifyExplode[1] == "thumbslider") : $thumbsliderActive = "selected"; else : $thumbsliderActive = ""; endif;
+
+                                                                    ?>
+                                                                        <select id="notifyValue" name="notifyEffect" id="notifyEffect" class="form-control material input-sm" required>
+
+                                                                            <option value="bar-slidetop" <?=$slidetopActive;?>>Slide From Top</option>
+                                                                            <option value="bar-exploader" <?=$exploaderActive;?>>Exploader From Top</option>
+                                                                            <option value="attached-flip" <?=$flipActive;?>>Flip</option>
+                                                                            <option value="attached-bouncyflip" <?=$bouncyflipActive;?>>Bouncy Flip</option>
+                                                                            <option value="growl-scale" <?=$scaleActive;?>>Growl Scale</option>
+                                                                            <option value="growl-genie" <?=$genieActive;?>>Growl Genie</option>
+                                                                            <option value="growl-jelly" <?=$jellyActive;?>>Growl Jelly</option>
+                                                                            <option value="growl-slide" <?=$slideActive;?>>Growl Slide</option>
+                                                                            <option value="other-boxspinner" <?=$boxspinnerActive;?>>Spinning Box</option>
+                                                                            <option value="other-thumbslider" <?=$thumbsliderActive;?>>Sliding</option>
+
+                                                                        </select>
 
-                                                            <label for="gravatar"></label><?php echo $language->translate("GRAVATAR");?>
+                                                                        <button id="notifyTest" type="button" class="class='btn waves btn-labeled btn-success btn btn-sm text-uppercase waves-effect waves-float"><span class="btn-label"><i class="fa fa-flask"></i></span><?php echo $language->translate("TEST");?></button>
 
+                                                                        <p class="help-text"><?php echo $language->translate("NOTIFICATION_TYPE");?></p>
+
+                                                                    </div>
+
+                                                                </div>
+                                                                
+                                                                <div class="content-form form-inline">
+
+                                                                    <div class="form-group">
+                                                                        <?php  if(LOADINGSCREEN == "true") : $loadingScreen = "checked"; else : $loadingScreen = ""; endif;?>
+                                                                        <input id="" class="switcher switcher-success" value="false" name="loadingScreen" type="hidden">
+                                                                        <input id="loadingScreen" class="switcher switcher-success" value="true" name="loadingScreen" type="checkbox" <?php echo $loadingScreen;?>>
+
+                                                                        <label for="loadingScreen"></label><?php echo $language->translate("ENABLE_LOADING_SCREEN");?>
+
+                                                                    </div>
+
+                                                                    <div class="form-group">
+                                                                        <?php  if(SLIMBAR == "true") : $enableSlimBar = "checked"; else : $enableSlimBar = ""; endif;?>
+                                                                        <input id="" class="switcher switcher-success" value="false" name="slimBar" type="hidden">
+                                                                        <input id="slimBar" class="switcher switcher-success" value="true" name="slimBar" type="checkbox" <?php echo $enableSlimBar;?>>
+
+                                                                        <label for="slimBar"></label><?php echo $language->translate("ENABLE_SLIMBAR");?>
+
+                                                                    </div>
+
+                                                                    <div class="form-group">
+                                                                        <?php  if(GRAVATAR == "true") : $enableGravatar = "checked"; else : $enableGravatar = ""; endif;?>
+                                                                        <input id="" class="switcher switcher-success" value="false" name="gravatar" type="hidden">
+                                                                        <input id="gravatar" class="switcher switcher-success" value="true" name="gravatar" type="checkbox" <?php echo $enableGravatar;?>>
+
+                                                                        <label for="gravatar"></label><?php echo $language->translate("GRAVATAR");?>
+
+                                                                    </div>
+
+                                                                </div>
+                                                                
+                                                            </div>
+                                                            
                                                         </div>
                                                         
-                                                    </div>
+                                                    </div>                                                    
                                                     
                                                     <button type="submit" class="class='btn waves btn-labeled btn-success btn btn-sm pull-right text-uppercase waves-effect waves-float"><span class="btn-label"><i class="fa fa-floppy-o"></i></span>Save</button>
 
@@ -3336,20 +3404,20 @@ endif;?></textarea>
             $(".email-header .close-button").click(function () {
                 $(".email-content").removeClass("email-active");
                 $('html').removeClass("overhid");
-                $(".nav").find("li").removeClass("active");
+                $("#settings-list").find("li").removeClass("active");
             });
             
-            $(document).mouseup(function (e)
+             $(document).mouseup(function (e)
 {
                 var container = $(".email-content");
 
                 if (!container.is(e.target) && container.has(e.target).length === 0) {
                     $(".email-content").removeClass("email-active");
                     $('html').removeClass("overhid");
-                    $(".nav").find("li").removeClass("active");
+                    $("#settings-list").find("li").removeClass("active");
                 }
                 
-            });
+            }); 
             
             $( document ).on( 'keydown', function ( e ) {
                 if ( e.keyCode === 27 ) { // ESC
@@ -3358,7 +3426,7 @@ endif;?></textarea>
                     if (!container.is(e.target) && container.has(e.target).length === 0) {
                         $(".email-content").removeClass("email-active");
                         $('html').removeClass("overhid");
-                        $(".nav").find("li").removeClass("active");
+                        $("#settings-list").find("li").removeClass("active");
                     }
                 }
             });
@@ -3550,33 +3618,53 @@ endif;?></textarea>
         <script>
         
         $( document ).ready(function() {
-            
+            //Hide Icon box on load
+            $( "div[class^='jFiler jFiler-theme-dragdropbox']" ).hide();
+            //Set Some Scrollbars
             $(".scroller-body").niceScroll({
                 railpadding: {top:0,right:0,left:0,bottom:0}
             });
-            
-            
             $(".email-content").niceScroll({
                 railpadding: {top:0,right:0,left:0,bottom:0}
             });
-            
+            //Stop Div behind From Scrolling
             $( '.email-content' ).on( 'mousewheel', function ( e ) {
-          
                 e.preventDefault();
-
             }, false);  
-            
+            //Set Hide Function
+            var authTypeFunc = function() {
+                // Hide Everything
+                $('#host-selected, #host-other, #host-plex, #host-emby, #host-ldap').hide();
+                // Qualify Auth Type
+                if($('#authType').val() !== "internal"){
+                    $( '#host-selected' ).show();
+
+                    // Qualify aithBackend
+                    if($('#authBackend').val() === "plex"){
+                        $('#host-selected, #host-plex').show();
+                    }else if($('#authBackend').val().indexOf("emby")>=0){
+                        $('#host-selected, #host-other, #host-emby').show();
+                    }else if($('#authBackend').val() === "ldap"){
+                        $('#host-selected, #host-other, #host-ldap').show();
+                    }else {
+                        $('#host-selected, #host-other').show();
+                    }
+                }
+            }
+            //Hide Settings on selection
+            $('#authType, #authBackend').on('change', authTypeFunc);
+            //Hide Settings on Load
+            authTypeFunc();
+            //Simulate Edit Tabs Click 
             $("#open-tabs").trigger("click");
-            
+            //Append Delete log to User Logs
             $("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");?>')
-            
+            //Enable Tooltips
             $('[data-toggle="tooltip"]').tooltip(); 
-            
-            rememberTabSelection('#settingsTabs', !localStorage);
-            
-            $( "div[class^='jFiler jFiler-theme-dragdropbox']" ).hide();
-        		
+            //Tab save on reload - might need to delete as we changed tab layout
+            //rememberTabSelection('#settingsTabs', !localStorage); 
+        	//AJAX call to github to get version info	
         	$.ajax({
         				
         		type: "GET",
@@ -3638,6 +3726,7 @@ endif;?></textarea>
                 }
                 
             });
+            //Edit Info tab with Github info
             <?php if(file_exists(FAIL_LOG)) : ?>
             goodCount = $('#loginStats').find('#goodCount');
             goodPercent = $('#loginStats').find('#goodPercent');

user.php

@@ -11,13 +11,10 @@
 	// Include functions if not already included
 	require_once('functions.php');
 	
-	// Upgrade environment
-	upgradeCheck();
-	
 	// Define Version
 	 define('INSTALLEDVERSION', '1.31');
 	 
-    // Autoload whatever this is
+    // Autoload frameworks
 	require_once(__DIR__ . '/vendor/autoload.php');
 	
     // Lazyload settings