Merge pull request #577 from causefx/cero-dev

Cero dev

functions.php

@@ -2,7 +2,7 @@
 
 // ===================================
 // Define Version
- define('INSTALLEDVERSION', '1.42');
+ define('INSTALLEDVERSION', '1.44');
 // ===================================
 use Kryptonit3\Sonarr\Sonarr;
 use Kryptonit3\SickRage\SickRage;
@@ -3783,7 +3783,7 @@ function getPlexPlaylists(){
 			// Identify the local machine
 			$gotServer = $getServer['machineIdentifier'];
 			$output = "";
-			$hideMenu = '<div class="pull-right"><div class="btn-group" role="group"><button type="button" id="playlist-Name" class="btn waves btn-default btn-sm dropdown-toggle waves-effect waves-float" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Choose A Playlist &nbsp;<span class="caret"></span></button><ul style="right:0; left: auto" class="dropdown-menu filter-recent-playlist">';
+			$hideMenu = '<div class="pull-right"><div class="btn-group" role="group"><button type="button" id="playlist-Name" class="btn waves btn-default btn-sm dropdown-toggle waves-effect waves-float" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Choose A Playlist &nbsp;<span class="caret"></span></button><ul style="right:0; left: auto; height: 200px;" class="dropdown-menu filter-recent-playlist playlist-listing">';
 			foreach($api AS $child) {
 				$items = array();
 				if ($child['playlistType'] == "video" && strpos(strtolower($child['title']) , 'private') === false){

homepage.php

@@ -769,6 +769,11 @@ foreach(loadAppearance() as $key => $value) {
                 scrollspeed: 30,
                 mousescrollstep: 60
             });
+            $(".playlist-listing").niceScroll({
+                railpadding: {top:0,right:0,left:0,bottom:0},
+                scrollspeed: 30,
+                mousescrollstep: 60
+            });
 
             <?php if((NZBGETURL != "" && qualifyUser(NZBGETHOMEAUTH)) || (SABNZBDURL != "" && qualifyUser(SABNZBDHOMEAUTH))){ ?>
             var queueRefresh = <?php echo DOWNLOADREFRESH; ?>;

index.php

@@ -1054,7 +1054,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 			</div>
 		</div>
 		<?php } ?>
-		<?php if (file_exists('config/config.php') && $configReady = "Yes" && $tabSetup == "No" && SPLASH == "true") {?>
+		<?php if (file_exists('config/config.php') && $configReady == "Yes" && $tabSetup == "No" && SPLASH == "true") {?>
 		<div id="splashScreen" class="splash-modal modal fade">
 			<div style="background:<?=$sidebar;?>;" class="table-wrapper big-box">
 				
@@ -1140,7 +1140,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 		<script src="js/jquery.mousewheel.min.js" type="text/javascript"></script>
 
 		<script>
-		<?php if (file_exists('config/config.php') && $configReady = "Yes" && $tabSetup == "No" && SPLASH == "true") {?>    
+		<?php if (file_exists('config/config.php') && $configReady == "Yes" && $tabSetup == "No" && SPLASH == "true") {?>    
 		$('.splash-modal').modal("show");
 		<?php } ?>
 		var fixed = document.getElementById('gn-scroller');
@@ -1398,9 +1398,14 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 			}
 			if (defaultTab == null){
 				$("div[id^='tabEmpty']").show();
-				<?php if($needSetup == "No" && $configReady == "Yes") : if(!$USER->authenticated) : ?>
-				$('#loginModal').modal("show");
-				<?php endif; endif; ?>
+				<?php 
+				echo "console.log('Need Setup = $needSetup | Config Ready = $configReady');";
+				if($needSetup == "No" && $configReady == "Yes"){
+					if(!$USER->authenticated){
+						echo "$('#loginModal').modal('show');";
+					}
+				}
+				?>
 			}
 			if ($(location).attr('hash')){
 				var getHash = $(location).attr('hash').substr(1).replace("%20", " ").replace("_", " ");