Browse Source

Merge pull request #193 from causefx/develop

Small Tiny Fix
causefx 9 years ago
parent
commit
3553650621
2 changed files with 31 additions and 12 deletions
  1. 30 11
      downloader.php
  2. 1 1
      user.php

+ 30 - 11
downloader.php

@@ -109,22 +109,41 @@ if($downloader == "sabnzbd"){
     foreach ($api[$list]['slots'] AS $child) {
         
         $i++;
-        if($list == "queue"){ $downloadName = $child['filename']; $downloadCategory = $child['cat']; $downloadPercent = (($child['mb'] - $child['mbleft']) / $child['mb']) * 100; $progressBar = "progress-bar-striped active"; } 
-        if($list == "history"){ $downloadName = $child['name']; $downloadCategory = $child['category']; $downloadPercent = "100"; $progressBar = ""; }
-        $downloadStatus = $child['status'];
         
-        if($child['missing'] > "400"){ 
-            $downloadHealth = "danger"; 
-        }elseif($child['missing'] <= "400"){ 
-            $downloadHealth = "warning"; 
-        }elseif($child['missing'] <= "200"){ 
+        if($list == "queue"){ 
+            
+            $downloadName = $child['filename']; 
+            $downloadCategory = $child['cat']; 
+            $downloadPercent = (($child['mb'] - $child['mbleft']) / $child['mb']) * 100; 
+            $progressBar = "progress-bar-striped active"; 
+            
+            if($child['missing'] > "400"){ 
+                
+                $downloadHealth = "danger"; 
+            
+            }elseif($child['missing'] <= "200"){ 
+            
+                $downloadHealth = "success"; 
+            
+            }elseif($child['missing'] <= "400"){ 
+            
+                $downloadHealth = "warning"; 
+            
+            }
+
+        } 
+        
+        if($list == "history"){ 
+            
+            $downloadName = $child['name'];
+            $downloadCategory = $child['category']; 
+            $downloadPercent = "100"; 
+            $progressBar = ""; 
             $downloadHealth = "success"; 
-        }
         
-        if(!isset($child['missing'])){
-            $downloadHealth = "success";
         }
         
+        $downloadStatus = $child['status'];
         
         $gotNZB .= '<tr>
 

+ 1 - 1
user.php

@@ -8,7 +8,7 @@
 	 * salting subsequent password checks.
 	 */
     
-    define('INSTALLEDVERSION', '1.21');
+    define('INSTALLEDVERSION', '1.22');
 
     $databaseConfig = parse_ini_file('databaseLocation.ini.php', true);
     define('USER_HOME', $databaseConfig['databaseLocation'] . '/users/');