Merge pull request #509 from causefx/cero-dev

Added Refresh seconds back in, fixed icon upload

functions.php

@@ -709,7 +709,7 @@ function resolvePlexItem($server, $token, $item, $nowPlaying = false, $showNames
             $image = 'slick-image-tall';
             $style = '';
             if(!$nowPlaying){ 
-                $thumb = $item['parentThumb'];
+                $thumb = ($item['parentThumb'] ? $item['parentThumb'] : $item['grandparentThumb']);
                 $key = $item['ratingKey'] . "-list";
             }else { 
                 $height = 281;

homepage.php

@@ -781,8 +781,8 @@ $endDate = date('Y-m-d',strtotime("+".CALENDARENDDAY." days"));
             // check if browser support HTML5 local storage
 			
             <?php if((NZBGETURL != "" && qualifyUser(NZBGETHOMEAUTH)) || (SABNZBDURL != "" && qualifyUser(SABNZBDHOMEAUTH))){ ?>
-            var queueRefresh = 30000;
-            var historyRefresh = 120000; // This really doesn't need to happen that often
+            var queueRefresh = <?php echo DOWNLOADREFRESH; ?>;
+            var historyRefresh = <?php echo HISTORYREFRESH; ?>; // This really doesn't need to happen that often
 
             var queueLoad = function() {
             <?php if(SABNZBDURL != "") { echo '$("tbody.dl-queue.sabnzbd").load("ajax.php?a=sabnzbd-update&list=queue");'; } ?>

js/custom.js

@@ -88,11 +88,8 @@ $(document).ready(function(){
 			beforeSend: function(){},
 			success: function(data, itemEl, listEl, boxEl, newInputEl, inputEl, id){
 				var parent = itemEl.find(".jFiler-jProgressBar").parent(),
-					new_file_name = JSON.parse(data),
 					filerKit = inputEl.prop("jFiler");
 
-        		filerKit.files_list[id].name = new_file_name;
-
 				itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){
 					$("<div class=\"jFiler-item-others text-success\"><i class=\"fa fa-check\"></i> Success</div>").hide().appendTo(parent).fadeIn("slow");
 				});

lang/de.ini

@@ -306,3 +306,5 @@ EMAIL_NEWUSER_BUTTON = "Login"
 EMAIL_NEWUSER_SUBTITLE = "What do I do?"
 EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
 PLAYLISTS = "Playlists"
+DOWNLOAD_REFRESH = "Refresh Download Queue"
+HISTORY_REFRESH = "Refresh History"

lang/en.ini

@@ -306,3 +306,5 @@ EMAIL_NEWUSER_BUTTON = "Login"
 EMAIL_NEWUSER_SUBTITLE = "What do I do?"
 EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
 PLAYLISTS = "Playlists"
+DOWNLOAD_REFRESH = "Refresh Download Queue"
+HISTORY_REFRESH = "Refresh History"

lang/es.ini

@@ -306,3 +306,5 @@ EMAIL_NEWUSER_BUTTON = "Login"
 EMAIL_NEWUSER_SUBTITLE = "What do I do?"
 EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
 PLAYLISTS = "Playlists"
+DOWNLOAD_REFRESH = "Refresh Download Queue"
+HISTORY_REFRESH = "Refresh History"

lang/fr.ini

@@ -306,3 +306,5 @@ EMAIL_NEWUSER_BUTTON = "Login"
 EMAIL_NEWUSER_SUBTITLE = "What do I do?"
 EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
 PLAYLISTS = "Playlists"
+DOWNLOAD_REFRESH = "Refresh Download Queue"
+HISTORY_REFRESH = "Refresh History"

lang/it.ini

@@ -306,3 +306,5 @@ EMAIL_NEWUSER_BUTTON = "Login"
 EMAIL_NEWUSER_SUBTITLE = "What do I do?"
 EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
 PLAYLISTS = "Playlists"
+DOWNLOAD_REFRESH = "Refresh Download Queue"
+HISTORY_REFRESH = "Refresh History"

lang/nl.ini

@@ -306,3 +306,5 @@ EMAIL_NEWUSER_BUTTON = "Login"
 EMAIL_NEWUSER_SUBTITLE = "What do I do?"
 EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
 PLAYLISTS = "Playlists"
+DOWNLOAD_REFRESH = "Refresh Download Queue"
+HISTORY_REFRESH = "Refresh History"

lang/pl.ini

@@ -306,3 +306,5 @@ EMAIL_NEWUSER_BUTTON = "Login"
 EMAIL_NEWUSER_SUBTITLE = "What do I do?"
 EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
 PLAYLISTS = "Playlists"
+DOWNLOAD_REFRESH = "Refresh Download Queue"
+HISTORY_REFRESH = "Refresh History"

settings.php

@@ -658,6 +658,16 @@ $branchTypes = array(
 	'Develop' => 'develop',
 	'Pre-Develop' => 'cero-dev',
 );
+$refreshSeconds = array(
+	'1 sec' => '1000',
+	'5 secs' => '5000',
+	'10 secs' => '10000',
+	'15 secs' => '15000',
+	'30 secs' => '30000',
+	'60 secs' => '60000',
+	'90 secs' => '90000',
+	'120 secs' => '120000',
+);
 
 // Build Homepage Settings
 echo buildSettings(
@@ -1010,6 +1020,20 @@ echo buildSettings(
 						'name' => 'sabnzbdKey',
 						'value' => SABNZBDKEY,
 					),
+                    array(
+						'type' => $userSelectType,
+						'labelTranslate' => 'DOWNLOAD_REFRESH',
+						'name' => 'downloadRefresh',
+						'value' => DOWNLOADREFRESH,
+						'options' => $refreshSeconds,
+					),
+                    array(
+						'type' => $userSelectType,
+						'labelTranslate' => 'HISTORY_REFRESH',
+						'name' => 'historyRefresh',
+						'value' => HISTORYREFRESH,
+						'options' => $refreshSeconds,
+					),
 				),
 			),
 			array(
@@ -1045,6 +1069,20 @@ echo buildSettings(
 						'name' => 'nzbgetPassword',
 						'value' => (empty(NZBGETPASSWORD)?'':randString(20)),
 					),
+                    array(
+						'type' => $userSelectType,
+						'labelTranslate' => 'DOWNLOAD_REFRESH',
+						'name' => 'downloadRefresh',
+						'value' => DOWNLOADREFRESH,
+						'options' => $refreshSeconds,
+					),
+                    array(
+						'type' => $userSelectType,
+						'labelTranslate' => 'HISTORY_REFRESH',
+						'name' => 'historyRefresh',
+						'value' => HISTORYREFRESH,
+						'options' => $refreshSeconds,
+					),
 				),
 			),
 			array(
@@ -1283,7 +1321,7 @@ echo buildSettings(
 						'type' => 'text',
 						'placeholder' => randString(32),
 						'labelTranslate' => 'EMBY_TOKEN',
-						'name' => 'plexToken',
+						'name' => 'embyToken',
 						'class' => 'be-auth be-auth-emby_all be-auth-emby_connect',
 						'pattern' => '[a-zA-Z0-9]{32}',
 						'value' => EMBYTOKEN,