Merge pull request #671 from mesa57/develop

Issue #670
spotweb · Mar 2, 2021 · 92b3ed9 · 92b3ed9
2 parents 16ef0c0 + 25d01d7
commit 92b3ed9
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/lib/page/SpotPage_newznabapi.php b/lib/page/SpotPage_newznabapi.php
@@ -825,7 +825,7 @@ public function Cat2NewznabCat($hcat, $cat, $catZ)
 
                 case 'b': $newznabcat = $this->spotBcat2nabcat();
 
-return @$newznabcat[$nr]; break;
+                    return @$newznabcat[$nr]; break;
             } // switch
         } // if
 
@@ -954,11 +954,11 @@ public function nabcat2spotcat($cat)
             case 4040: return 'cat3_a4,cat3_a5,cat3_a6,cat3_a7';
             case 4050: return 'cat2_a';
 
-            case 5000: return 'cat0_z1';
-            case 5020: return 'cat0_z1_a0,cat0_z1_a1,cat0_z1_a2,cat0_z1_a3,cat0_z1_a4,cat0_z1_a6,cat0_z1_a7,cat0_z1_a8,cat0_z1_a9,cat0_z1_a10';
-            case 5030: return 'cat0_z1_a0,cat0_z1_a1,cat0_z1_a2,cat0_z1_a3,cat0_z1_a10';
-            case 5040: return 'cat0_z1_a4,cat0_z1_a6,cat0_z1_a7,cat0_z1_a8,cat0_z1_a9';
-            case 5050: return 'cat0_z1_a0,cat0_z1_a1,cat0_z1_a2,cat0_z1_a3,cat0_z1_a4,cat0_z1_a6,cat0_z1_a7,cat0_z1_a8,cat0_z1_a9,cat0_z1_a10';
+            case 5000: return 'cat0_z1,cat0_z1_d';
+            case 5020: return 'cat0_z1,cat0_z1_d';
+            case 5030: return 'cat0_z1_a0,cat0_z1_a1,cat0_z1_a2,cat0_z1_a3,cat0_z1_a10,cat0_z1_d';
+            case 5040: return 'cat0_z1_a4,cat0_z1_a6,cat0_z1_a7,cat0_z1_a8,cat0_z1_a9,cat0_z1_a14,cat0_z1_a15,cat0_z1_d';
+            case 5050: return 'cat0_z1,cat0_z1_d';
             case 5060: return 'cat0_z1_d18';
             case 5070: return 'cat0_z1_d29';
 
@@ -1015,7 +1015,7 @@ public function spotAcat2nabcat()
                               5  => '6000|6000',
                               6  => '6000|6040',
                               7  => '6000|6040',
-                              8  => '6000|65040',
+                              8  => '6000|6030',
                               9  => '6000|6040',
                               10 => '6000|6030',
                               11 => '6000|6000', ],