NNTmux / newznab-tmux

Blacklight/Books.php

Spacing +9 added lines, -9 removed lines

@@ -169,8 +169,8 @@ 
 			%s
 			GROUP BY boo.id
 			ORDER BY %s %s',
-            \is_array($bookIDs) && ! empty($bookIDs) ? implode(',', $bookIDs) : -1,
-            \is_array($releaseIDs) && ! empty($releaseIDs) ? implode(',', $releaseIDs) : -1,
+            \is_array($bookIDs) && !empty($bookIDs) ? implode(',', $bookIDs) : -1,
+            \is_array($releaseIDs) && !empty($releaseIDs) ? implode(',', $releaseIDs) : -1,
             $catsrch,
             $order[0],
             $order[1]
@@ -235,7 +235,7 @@ 
     {
         $browseby = ' ';
         foreach ($this->getBrowseByOptions() as $bbk => $bbv) {
-            if (! empty($_REQUEST[$bbk])) {
+            if (!empty($_REQUEST[$bbk])) {
                 $bbs = stripslashes($_REQUEST[$bbk]);
                 $browseby .= ' AND boo.'.$bbv.' '.'LIKE '.escapeString('%'.$bbs.'%');
             }
@@ -365,7 +365,7 @@ 
                 return false;
             }
 
-            if (preg_match('/^([a-z0-9ü!]+ ){1,2}(N|Vol)?\d{1,4}([abc])?$|^([a-z0-9]+ ){1,2}(Jan( |unar|$)|Feb( |ruary|$)|Mar( |ch|$)|Apr( |il|$)|May(?![a-z0-9])|Jun([ e$])|Jul([ y$])|Aug( |ust|$)|Sep( |tember|$)|O([ck])t( |ober|$)|Nov( |ember|$)|De([cz])( |ember|$))/ui', $releasename) && ! preg_match('/Part \d+/i', $releasename)) {
+            if (preg_match('/^([a-z0-9ü!]+ ){1,2}(N|Vol)?\d{1,4}([abc])?$|^([a-z0-9]+ ){1,2}(Jan( |unar|$)|Feb( |ruary|$)|Mar( |ch|$)|Apr( |il|$)|May(?![a-z0-9])|Jun([ e$])|Jul([ y$])|Aug( |ust|$)|Sep( |tember|$)|O([ck])t( |ober|$)|Nov( |ember|$)|De([cz])( |ember|$))/ui', $releasename) && !preg_match('/Part \d+/i', $releasename)) {
                 if ($this->echooutput) {
                     $this->colorCli->headerOver('Changing category to magazines: ').$this->colorCli->primary($releasename);
                 }
@@ -373,14 +373,14 @@ 
 
                 return false;
             }
-            if (! empty($releasename) && ! preg_match('/^[a-z0-9]+$|^([0-9]+ ){1,}$|Part \d+/i', $releasename)) {
+            if (!empty($releasename) && !preg_match('/^[a-z0-9]+$|^([0-9]+ ){1,}$|Part \d+/i', $releasename)) {
                 return $releasename;
             }
 
             return false;
         }
         if ($releasetype === 'audiobook') {
-            if (! empty($releasename) && ! preg_match('/^[a-z0-9]+$|^([0-9]+ ){1,}$|Part \d+/i', $releasename)) {
+            if (!empty($releasename) && !preg_match('/^[a-z0-9]+$|^([0-9]+ ){1,}$|Part \d+/i', $releasename)) {
                 // we can skip category for audiobooks, since we already know it, so as long as the release name is valid return it so that it is postprocessed by amazon.  In the future, determining the type of audiobook could be added (Lecture or book), since we can skip lookups on lectures, but for now handle them all the same way
                 return $releasename;
             }
@@ -404,7 +404,7 @@ 
 
         $book = false;
         if ($bookInfo !== '') {
-            if (! $book) {
+            if (!$book) {
                 $this->colorCli->info('Fetching data from iTunes for '.$bookInfo);
                 $book = $this->fetchItunesBookProperties($bookInfo);
             } elseif ($amazdata !== null) {
@@ -511,12 +511,12 @@ 
                 'salesrank' => '',
                 'publisher' => '',
                 'pages' => '',
-                'coverurl' => ! empty($iTunesBook->getCover()) ? str_replace('100x100', '800x800', $iTunesBook->getCover()) : '',
+                'coverurl' => !empty($iTunesBook->getCover()) ? str_replace('100x100', '800x800', $iTunesBook->getCover()) : '',
                 'genre' => implode(', ', $iTunesBook->getGenre()),
                 'overview' => strip_tags($iTunesBook->getDescription()),
                 'publishdate' => $iTunesBook->getReleaseDate()->format('Y-m-d'),
             ];
-            if (! empty($book['coverurl'])) {
+            if (!empty($book['coverurl'])) {
                 $book['cover'] = 1;
             } else {
                 $book['cover'] = 0;

Blacklight/Categorize.php

Spacing +15 added lines, -15 removed lines

@@ -100,7 +100,7 @@ 
     public function isTV(): bool
     {
         if (preg_match('/Daily[\-_\.]Show|Nightly News|^\[[a-zA-Z\.\-]+\].*[\-_].*\d{1,3}[\-_. ](([\[\(])(h264-)?\d{3,4}([pi])([\]\)])\s?(\[AAC\])?|\[[a-fA-F0-9]{8}\]|(8|10)BIT|hi10p)(\[[a-fA-F0-9]{8}\])?|(\d\d-){2}[12]\d{3}|[12]\d{3}(\.\d\d){2}|\d+x\d+|\.e\d{1,3}\.|s\d{1,4}[._ -]?[ed]\d{1,3}([ex]\d{1,3}|[\-.\w ])|[._ -](\dx\d\d|C4TV|Complete[._ -]Season|DSR|([DHPS])DTV|EP[._ -]?\d{1,3}|S\d{1,3}.+Extras|SUBPACK|Season[._ -]\d{1,2})([._ -]|$)|TVRIP|TV[._ -](19|20)\d\d|Troll(HD|UHD)/i', $this->releaseName)
-            && ! preg_match('/[._ -](flac|imageset|mp3|xxx)[._ -]|[ .]exe$/i', $this->releaseName)) {
+            && !preg_match('/[._ -](flac|imageset|mp3|xxx)[._ -]|[ .]exe$/i', $this->releaseName)) {
             switch (true) {
                 case $this->isOtherTV():
                 case $this->categorizeForeign && $this->isForeignTV():
@@ -137,7 +137,7 @@ 
     {
         if (preg_match('/[._ -]S\d{1,3}.+(EP\d{1,3}|Extras|SUBPACK)[._ -]|News/i', $this->releaseName)
             //special case for "Have.I.Got.News.For.You" tv show
-            && ! preg_match('/[._ -]Got[._ -]News[._ -]For[._ -]You/i', $this->releaseName)
+            && !preg_match('/[._ -]Got[._ -]News[._ -]For[._ -]You/i', $this->releaseName)
         ) {
             $this->tmpCat = Category::TV_OTHER;
 
@@ -224,7 +224,7 @@ 
 
             return true;
         }
-        if (! $this->catWebDL && preg_match('/web[._ -]dl|web-?rip/i', $this->releaseName)) {
+        if (!$this->catWebDL && preg_match('/web[._ -]dl|web-?rip/i', $this->releaseName)) {
             $this->tmpCat = Category::TV_HD;
 
             return true;
@@ -284,7 +284,7 @@ 
 
     public function isMovie(): bool
     {
-        if (preg_match('/[._ -]AVC|[BH][DR]RIP|(Bluray|Blu-Ray)|BD[._ -]?(25|50)?|\bBR\b|Camrip|[._ -]\d{4}[._ -].+(720p|1080p|Cam|HDTS|2160p)|DIVX|[._ -]DVD[._ -]|DVD-?(5|9|R|Rip)|Untouched|VHSRip|XVID|[._ -](DTS|TVrip|webrip|WEBDL|WEB-DL)[._ -]|\b(2160)p\b.*\b(Netflix|Amazon|NF|AMZN|Disney)\b/i', $this->releaseName) && ! preg_match('/s\d{1,3}[._ -]?[ed]\d{1,3}|auto(cad|desk)|divx[._ -]plus|[._ -]exe$|[._ -](jav|XXX)[._ -]|SWE6RUS|\wXXX(1080p|720p|DVD)|Xilisoft|\.S[0-9]\d{1,3}\./i', $this->releaseName)) {
+        if (preg_match('/[._ -]AVC|[BH][DR]RIP|(Bluray|Blu-Ray)|BD[._ -]?(25|50)?|\bBR\b|Camrip|[._ -]\d{4}[._ -].+(720p|1080p|Cam|HDTS|2160p)|DIVX|[._ -]DVD[._ -]|DVD-?(5|9|R|Rip)|Untouched|VHSRip|XVID|[._ -](DTS|TVrip|webrip|WEBDL|WEB-DL)[._ -]|\b(2160)p\b.*\b(Netflix|Amazon|NF|AMZN|Disney)\b/i', $this->releaseName) && !preg_match('/s\d{1,3}[._ -]?[ed]\d{1,3}|auto(cad|desk)|divx[._ -]plus|[._ -]exe$|[._ -](jav|XXX)[._ -]|SWE6RUS|\wXXX(1080p|720p|DVD)|Xilisoft|\.S[0-9]\d{1,3}\./i', $this->releaseName)) {
             return match (true) {
                 $this->categorizeForeign && $this->isMovieForeign(), $this->isMovieDVD(), $this->isMovieX265(), $this->isMovieUHD(), $this->catWebDL && $this->isMovieWEBDL(), $this->isMovieSD(), $this->isMovie3D(), $this->isMovieBluRay(), $this->isMovieHD(), $this->isMovieOther() => true,
                 default => false,
@@ -346,7 +346,7 @@ 
     public function isMovieBluRay(): bool
     {
         if (preg_match('/bluray-|[._ -]bd?[._ -]?(25|50)|blu-ray|Bluray\s-\sUntouched|[._ -]untouched[._ -]/i', $this->releaseName)
-            && ! preg_match('/SecretUsenet\.com$/i', $this->releaseName)) {
+            && !preg_match('/SecretUsenet\.com$/i', $this->releaseName)) {
             $this->tmpCat = Category::MOVIE_BLURAY;
 
             return true;
@@ -373,7 +373,7 @@ 
 
     public function isMovieUHD(): bool
     {
-        if (! preg_match('/(S\d+).*(2160p).*(Netflix|Amazon).*(TrollUHD|NTb|VLAD)/i', $this->releaseName) && stripos($this->releaseName, '2160p') !== false) {
+        if (!preg_match('/(S\d+).*(2160p).*(Netflix|Amazon).*(TrollUHD|NTb|VLAD)/i', $this->releaseName) && stripos($this->releaseName, '2160p') !== false) {
             $this->tmpCat = Category::MOVIE_UHD;
 
             return true;
@@ -502,7 +502,7 @@ 
     public function isXxx(): bool
     {
         switch (true) {
-            case ! preg_match('/\bXXX\b|(a\.b\.erotica|ClubSeventeen|Cum(ming|shot)|Err?oticax?|Porn(o|lation)?|Imageset|PICTURESET|JAV Uncensored|lesb(ians?|os?)|mastur(bation|e?bate)|My_Stepfather_Made_Me|nympho?|OLDER ANGELS|pictures\.erotica\.anime|sexontv|slut|Squirt|SWE6RUS|Transsexual|whore)/i', $this->releaseName):
+            case !preg_match('/\bXXX\b|(a\.b\.erotica|ClubSeventeen|Cum(ming|shot)|Err?oticax?|Porn(o|lation)?|Imageset|PICTURESET|JAV Uncensored|lesb(ians?|os?)|mastur(bation|e?bate)|My_Stepfather_Made_Me|nympho?|OLDER ANGELS|pictures\.erotica\.anime|sexontv|slut|Squirt|SWE6RUS|Transsexual|whore)/i', $this->releaseName):
                 return false;
             case $this->isXxxPack():
             case $this->isXxxClipSD():
@@ -527,7 +527,7 @@ 
 
     public function isXxx264(): bool
     {
-        if (preg_match('/720p|1080(hd|[ip])|[xh][^a-z0-9]?264/i', $this->releaseName) && ! preg_match('/\bwmv\b/i', $this->releaseName) && stripos($this->releaseName, 'SDX264XXX') === false) {
+        if (preg_match('/720p|1080(hd|[ip])|[xh][^a-z0-9]?264/i', $this->releaseName) && !preg_match('/\bwmv\b/i', $this->releaseName) && stripos($this->releaseName, 'SDX264XXX') === false) {
             $this->tmpCat = Category::XXX_X264;
 
             return true;
@@ -699,7 +699,7 @@ 
 
     public function isGame3DS(): bool
     {
-        if (preg_match('/\b3DS\b[^max]|[\._-]3ds|nintendo.+3ds|[_\.]3DS-/i', $this->releaseName) && ! preg_match('/3ds max/i', $this->releaseName) && preg_match('/(EUR|FR|GAME|HOL|JP|JPN|NL|NTSC|PAL|KS|USA|ASIA)/i', $this->releaseName)) {
+        if (preg_match('/\b3DS\b[^max]|[\._-]3ds|nintendo.+3ds|[_\.]3DS-/i', $this->releaseName) && !preg_match('/3ds max/i', $this->releaseName) && preg_match('/(EUR|FR|GAME|HOL|JP|JPN|NL|NTSC|PAL|KS|USA|ASIA)/i', $this->releaseName)) {
             $this->tmpCat = Category::GAME_3DS;
 
             return true;
@@ -902,7 +902,7 @@ 
     public function isMusic(): bool
     {
         return match (true) {
-            $this->isMusicVideo(), $this->isAudiobook(), $this->isMusicLossless(), $this->isMusicMP3(), $this->isMusicPodcast(),$this->isMusicOther() => true,
+            $this->isMusicVideo(), $this->isAudiobook(), $this->isMusicLossless(), $this->isMusicMP3(), $this->isMusicPodcast(), $this->isMusicOther() => true,
             default => false,
         };
     }
@@ -999,7 +999,7 @@ 
     public function isMusicOther(): bool
     {
         if (preg_match('/(19|20)\d\d\-(C4)$|[._ -]\d?CD[._ -](19|20)\d\d|\(\d\-?CD\)|\-\dcd\-|\d[._ -]Albums|Albums.+(EP)|Bonus.+Tracks|Box.+?CD.+SET|Discography|D\.O\.M|Greatest\sSongs|Live.+(Bootleg|Remastered)|Music.+Vol|([\(\[\s])NMR([\)\]\s])|Promo.+CD|Reggaeton|Tiesto.+Club|Vinyl\s2496|\WV\.A\.|^\(VA\s|^VA[._ -]/i', $this->releaseName)) {
-            if (! $this->isMusicForeign()) {
+            if (!$this->isMusicForeign()) {
                 $this->tmpCat = Category::MUSIC_OTHER;
             }
 
@@ -1050,7 +1050,7 @@ 
     public function isComic(): bool
     {
         switch (true) {
-            case ! preg_match('/[\. ](cbr|cbz)|[\( ]c2c|cbr|cbz[\) ]|comix|^\(comic|[\.\-_\(\[ ]comics?[._ -]|comic.+book|covers.+digital|DC.+(Adventures|Universe)|digital.+(son|zone)|Graphic.+Novel|[\.\-_h ]manga|Total[._ -]Marvel/i', $this->releaseName):
+            case !preg_match('/[\. ](cbr|cbz)|[\( ]c2c|cbr|cbz[\) ]|comix|^\(comic|[\.\-_\(\[ ]comics?[._ -]|comic.+book|covers.+digital|DC.+(Adventures|Universe)|digital.+(son|zone)|Graphic.+Novel|[\.\-_h ]manga|Total[._ -]Marvel/i', $this->releaseName):
                 return false;
             case $this->isBookForeign():
                 break;
@@ -1065,7 +1065,7 @@ 
     public function isTechnicalBook(): bool
     {
         switch (true) {
-            case ! preg_match('/^\(?(atz|bb|css|c ?t|Drawing|Gabler|IOS|Iphone|Lynda|Manning|Medic(al|ine)|MIT|No[._ -]Starch|Packt|Peachpit|Pragmatic|Revista|Servo|SmartBooks|Spektrum|Strata|Sybex|Syngress|Vieweg|Wiley|Woods|Wrox)[._ -]|[._ -](Ajax|CSS|DIY|Javascript|(My|Postgre)?SQL|XNA)[._ -]|3DS\.\-_ ]Max|Academic|Adobe|Algebra|Analysis|Appleworks|Archaeology|Bitdefender|Birkhauser|Britannica|[._ -]C\+\+|C[._ -](\+\+|Sharp|Plus)|Chemistry|Circuits|Cook(book|ing)|(Beginners?|Complete|Communications|Definitive|Essential|Hackers?|Practical|Professionals?)[._ -]Guide|Developer|Diagnostic|Disassembl(er|ing|y)|Debugg(er|ing)|Dreamweaver|Economics|Education|Electronics|Enc([iy])clopedia|Engineer(ing|s)|Essays|Exercizes|For.+Beginners|Focal[._ -]Press|For[._ -]Dummies|FreeBSD|Fundamentals[._ -]of[._ -]|(Galileo|Island)[._ -]Press|Geography|Grammar|Guide[._ -](For|To)|Hacking|Google|Handboo?k|How[._ -](It|To)|Intoduction[._ -]to|Iphone|jQuery|Lessons[._ -]In|Learning|LibreOffice|Linux|Manual|Marketing|Masonry|Mathematic(al|s)?|Medical|Microsoft|National[._ -]Academies|Nero[._ -]\d+|OReilly|OS[._ -]X[._ -]|Official[._ -]Guide|Open(GL|Office)|Pediatric|Periodic.+Table|Photoshop|Physics|Power(PC|Point|Shell)|Programm(ers?|ier||ing)|Raspberry.+Pi|Remedies|Service\s?Manual|SitePoint|Sketching|Statistics|Stock.+Market|Students|Theory|Training|Tutsplus|Ubuntu|Understanding[._ -](and|Of|The)|Visual[._ -]Studio|Textbook|VMWare|wii?max|Windows[._ -](8|7|Vista|XP)|^Wood[._ -]|Woodwork|WordPress|Work(book|shop)|Youtube/i', $this->releaseName):
+            case !preg_match('/^\(?(atz|bb|css|c ?t|Drawing|Gabler|IOS|Iphone|Lynda|Manning|Medic(al|ine)|MIT|No[._ -]Starch|Packt|Peachpit|Pragmatic|Revista|Servo|SmartBooks|Spektrum|Strata|Sybex|Syngress|Vieweg|Wiley|Woods|Wrox)[._ -]|[._ -](Ajax|CSS|DIY|Javascript|(My|Postgre)?SQL|XNA)[._ -]|3DS\.\-_ ]Max|Academic|Adobe|Algebra|Analysis|Appleworks|Archaeology|Bitdefender|Birkhauser|Britannica|[._ -]C\+\+|C[._ -](\+\+|Sharp|Plus)|Chemistry|Circuits|Cook(book|ing)|(Beginners?|Complete|Communications|Definitive|Essential|Hackers?|Practical|Professionals?)[._ -]Guide|Developer|Diagnostic|Disassembl(er|ing|y)|Debugg(er|ing)|Dreamweaver|Economics|Education|Electronics|Enc([iy])clopedia|Engineer(ing|s)|Essays|Exercizes|For.+Beginners|Focal[._ -]Press|For[._ -]Dummies|FreeBSD|Fundamentals[._ -]of[._ -]|(Galileo|Island)[._ -]Press|Geography|Grammar|Guide[._ -](For|To)|Hacking|Google|Handboo?k|How[._ -](It|To)|Intoduction[._ -]to|Iphone|jQuery|Lessons[._ -]In|Learning|LibreOffice|Linux|Manual|Marketing|Masonry|Mathematic(al|s)?|Medical|Microsoft|National[._ -]Academies|Nero[._ -]\d+|OReilly|OS[._ -]X[._ -]|Official[._ -]Guide|Open(GL|Office)|Pediatric|Periodic.+Table|Photoshop|Physics|Power(PC|Point|Shell)|Programm(ers?|ier||ing)|Raspberry.+Pi|Remedies|Service\s?Manual|SitePoint|Sketching|Statistics|Stock.+Market|Students|Theory|Training|Tutsplus|Ubuntu|Understanding[._ -](and|Of|The)|Visual[._ -]Studio|Textbook|VMWare|wii?max|Windows[._ -](8|7|Vista|XP)|^Wood[._ -]|Woodwork|WordPress|Work(book|shop)|Youtube/i', $this->releaseName):
                 return false;
             case $this->isBookForeign():
                 break;
@@ -1080,7 +1080,7 @@ 
     public function isMagazine(): bool
     {
         switch (true) {
-            case ! preg_match('/[a-z\-\._ ][._ -](January|February|March|April|May|June|July|August|September|October|November|December)[._ -](\d{1,2},)?20\d\d[._ -]|^\(.+[ .]\d{1,2}[ .]20\d\d[ .].+\.scr|[._ -](Catalogue|FHM|NUTS|Pictorial|Tatler|XXX)[._ -]|^\(?(Allehanda|Club|Computer([a-z0-9]+)?|Connect \d+|Corriere|ct|Diario|Digit(al)?|Esquire|FHM|Gadgets|Galileo|Glam|GQ|Infosat|Inked|Instyle|io|Kicker|Liberation|New Scientist|NGV|Nuts|Popular|Professional|Reise|Sette(tv)?|Springer|Stuff|Studentlitteratur|Vegetarian|Vegetable|Videomarkt|Wired)[._ -]|Brady(.+)?Games|Catalog|Columbus.+Dispatch|Correspondenten|Corriere[._ -]Della[._ -]Sera|Cosmopolitan|Dagbladet|Digital[._ -]Guide|Economist|Eload ?24|ExtraTime|Fatto[._ -]Quotidiano|Flight[._ -](International|Journal)|Finanzwoche|France.+Football|Foto.+Video|Games?(Master|Markt|tar|TM)|Gardening|Gazzetta|Globe[._ -]And[._ -]Mail|Guitar|Heimkino|Hustler|La.+(Lettura|Rblica|Stampa)|Le[._ -](Monde|Temps)|Les[._ -]Echos|e?Magazin(es?)?|Mac(life|welt)|Marie.+Claire|Maxim|Men.+(Health|Fitness)|Motocross|Motorcycle|Mountain[._ -]Bike|MusikWoche|National[._ -]Geographic|New[._ -]Yorker|PC([._ -](Gamer|Welt|World)|Games|Go|Tip)|Penthouse|Photograph(er|ic)|Playboy|Posten|Quotidiano|(Golf|Readers?).+Digest|SFX[._ -]UK|Recipe(.+Guide|s)|SkyNews|Sport[._ -]?Week|Strategy.+Guide|TabletPC|Tattoo[._ -]Life|The[._ -]Guardian|Tageszeitung|Tid(bits|ning)|Top[._ -]Gear[._ -]|Total[._ -]Guitar|Travel[._ -]Guides?|Tribune[._ -]De[._ -]|US[._ -]Weekly|USA[._ -]Today|TruePDF|Vogue|Verlag|Warcraft|Web.+Designer|What[._ -]Car|Zeitung/i', $this->releaseName):
+            case !preg_match('/[a-z\-\._ ][._ -](January|February|March|April|May|June|July|August|September|October|November|December)[._ -](\d{1,2},)?20\d\d[._ -]|^\(.+[ .]\d{1,2}[ .]20\d\d[ .].+\.scr|[._ -](Catalogue|FHM|NUTS|Pictorial|Tatler|XXX)[._ -]|^\(?(Allehanda|Club|Computer([a-z0-9]+)?|Connect \d+|Corriere|ct|Diario|Digit(al)?|Esquire|FHM|Gadgets|Galileo|Glam|GQ|Infosat|Inked|Instyle|io|Kicker|Liberation|New Scientist|NGV|Nuts|Popular|Professional|Reise|Sette(tv)?|Springer|Stuff|Studentlitteratur|Vegetarian|Vegetable|Videomarkt|Wired)[._ -]|Brady(.+)?Games|Catalog|Columbus.+Dispatch|Correspondenten|Corriere[._ -]Della[._ -]Sera|Cosmopolitan|Dagbladet|Digital[._ -]Guide|Economist|Eload ?24|ExtraTime|Fatto[._ -]Quotidiano|Flight[._ -](International|Journal)|Finanzwoche|France.+Football|Foto.+Video|Games?(Master|Markt|tar|TM)|Gardening|Gazzetta|Globe[._ -]And[._ -]Mail|Guitar|Heimkino|Hustler|La.+(Lettura|Rblica|Stampa)|Le[._ -](Monde|Temps)|Les[._ -]Echos|e?Magazin(es?)?|Mac(life|welt)|Marie.+Claire|Maxim|Men.+(Health|Fitness)|Motocross|Motorcycle|Mountain[._ -]Bike|MusikWoche|National[._ -]Geographic|New[._ -]Yorker|PC([._ -](Gamer|Welt|World)|Games|Go|Tip)|Penthouse|Photograph(er|ic)|Playboy|Posten|Quotidiano|(Golf|Readers?).+Digest|SFX[._ -]UK|Recipe(.+Guide|s)|SkyNews|Sport[._ -]?Week|Strategy.+Guide|TabletPC|Tattoo[._ -]Life|The[._ -]Guardian|Tageszeitung|Tid(bits|ning)|Top[._ -]Gear[._ -]|Total[._ -]Guitar|Travel[._ -]Guides?|Tribune[._ -]De[._ -]|US[._ -]Weekly|USA[._ -]Today|TruePDF|Vogue|Verlag|Warcraft|Web.+Designer|What[._ -]Car|Zeitung/i', $this->releaseName):
                 return false;
             case $this->isBookForeign():
                 break;
@@ -1106,7 +1106,7 @@ 
     public function isEBook(): bool
     {
         switch (true) {
-            case ! preg_match('/^ePub|[._ -](Ebook|E?\-book|\) WW|Publishing)|[\.\-_\(\[ ](azw|epub|html|mobi|pdf|rtf|tif|txt)[\.\-_\)\] ]|[\. ](azw|doc|epub|mobi|pdf)(?![\w .])|\.ebook-\w$/i', $this->releaseName):
+            case !preg_match('/^ePub|[._ -](Ebook|E?\-book|\) WW|Publishing)|[\.\-_\(\[ ](azw|epub|html|mobi|pdf|rtf|tif|txt)[\.\-_\)\] ]|[\. ](azw|doc|epub|mobi|pdf)(?![\w .])|\.ebook-\w$/i', $this->releaseName):
                 return false;
             case $this->isBookForeign():
                 break;

Blacklight/libraries/Forking.php

Spacing +38 added lines, -38 removed lines

@@ -273,14 +273,14 @@ 
         $this->processWork();
         $maxWork = \count($this->work);
         foreach ($this->work as $group) {
-            $pool->add(function () use ($group) {
+            $pool->add(function() use ($group) {
                 return $this->_executeCommand(PHP_BINARY.' misc/update/backfill.php '.$group->name.(isset($group->max) ? (' '.$group->max) : ''));
-            }, 2000000)->then(function ($output) use ($group, $maxWork) {
+            }, 2000000)->then(function($output) use ($group, $maxWork) {
                 echo $output;
                 $this->colorCli->primary('Task #'.$maxWork.' Backfilled group '.$group->name);
-            })->catch(function (\Throwable $exception) {
+            })->catch(function(\Throwable $exception) {
                 echo $exception->getMessage();
-            })->catch(static function (SerializableException $serializableException) {
+            })->catch(static function(SerializableException $serializableException) {
                 //we do nothing here just catch the error and move on
             });
             $maxWork--;
@@ -346,7 +346,7 @@ 
         );
 
         $count = 0;
-        if (! empty($data) && isset($data[0]->name)) {
+        if (!empty($data) && isset($data[0]->name)) {
             $this->safeBackfillGroup = $data[0]->name;
 
             $count = ($data[0]->our_first - $data[0]->their_first);
@@ -368,14 +368,14 @@ 
 
             $this->processWork();
             foreach ($queues as $queue) {
-                $pool->add(function () use ($queue) {
+                $pool->add(function() use ($queue) {
                     return $this->_executeCommand($this->dnr_path.$queue.'"');
-                }, 2000000)->then(function ($output) {
+                }, 2000000)->then(function($output) {
                     echo $output;
                     $this->colorCli->primary('Backfilled group '.$this->safeBackfillGroup);
-                })->catch(function (\Throwable $exception) {
+                })->catch(function(\Throwable $exception) {
                     echo $exception->getMessage();
-                })->catch(static function (SerializableException $serializableException) {
+                })->catch(static function(SerializableException $serializableException) {
                     //we do nothing here just catch the error and move on
                 });
             }
@@ -408,14 +408,14 @@ 
 
         $this->processWork();
         foreach ($this->work as $group) {
-            $pool->add(function () use ($group) {
+            $pool->add(function() use ($group) {
                 return $this->_executeCommand(PHP_BINARY.' misc/update/update_binaries.php '.$group->name.' '.$group->max);
-            }, 2000000)->then(function ($output) use ($group, $maxWork) {
+            }, 2000000)->then(function($output) use ($group, $maxWork) {
                 echo $output;
                 $this->colorCli->primary('Task #'.$maxWork.' Updated group '.$group->name);
-            })->catch(function (\Throwable $exception) {
+            })->catch(function(\Throwable $exception) {
                 echo $exception->getMessage();
-            })->catch(static function (SerializableException $serializableException) {
+            })->catch(static function(SerializableException $serializableException) {
                 //we do nothing here just catch the error and move on
             });
             $maxWork--;
@@ -442,7 +442,7 @@ 
 			ORDER BY a.last_record DESC'
         );
 
-        if (! empty($this->work)) {
+        if (!empty($this->work)) {
             $i = 1;
             $queues = [];
             foreach ($this->work as $group) {
@@ -475,16 +475,16 @@ 
             $this->processWork();
             foreach ($queues as $queue) {
                 preg_match('/alt\..+/i', $queue, $hit);
-                $pool->add(function () use ($queue) {
+                $pool->add(function() use ($queue) {
                     return $this->_executeCommand($this->dnr_path.$queue.'"');
-                }, 2000000)->then(function ($output) use ($hit) {
-                    if (! empty($hit)) {
+                }, 2000000)->then(function($output) use ($hit) {
+                    if (!empty($hit)) {
                         echo $output;
                         $this->colorCli->primary('Updated group '.$hit[0]);
                     }
-                })->catch(function (\Throwable $exception) {
+                })->catch(function(\Throwable $exception) {
                     echo $exception->getMessage();
-                })->catch(static function (SerializableException $serializableException) {
+                })->catch(static function(SerializableException $serializableException) {
                     //we do nothing here just catch the error and move on
                 });
             }
@@ -547,14 +547,14 @@ 
 
         $this->processWork();
         foreach ($this->work as $queue) {
-            $pool->add(function () use ($queue) {
+            $pool->add(function() use ($queue) {
                 return $this->_executeCommand(PHP_BINARY.' misc/update/tmux/bin/groupfixrelnames.php "'.$queue.'"'.' true');
-            }, 2000000)->then(function ($output) use ($maxWork) {
+            }, 2000000)->then(function($output) use ($maxWork) {
                 echo $output;
                 $this->colorCli->primary('Task #'.$maxWork.' Finished fixing releases names');
-            })->catch(function (\Throwable $exception) {
+            })->catch(function(\Throwable $exception) {
                 echo $exception->getMessage();
-            })->catch(static function (SerializableException $serializableException) {
+            })->catch(static function(SerializableException $serializableException) {
                 //we do nothing here just catch the error and move on
             });
             $maxWork--;
@@ -575,7 +575,7 @@ 
         foreach ($work as $group) {
             try {
                 $query = DB::select(sprintf('SELECT id FROM collections WHERE groups_id = %d LIMIT 1', $group->id));
-                if (! empty($query)) {
+                if (!empty($query)) {
                     $uGroups[] = ['id' => $group->id, 'name' => $group->name];
                 }
             } catch (\PDOException $e) {
@@ -593,14 +593,14 @@ 
 
         $this->processWork();
         foreach ($uGroups as $group) {
-            $pool->add(function () use ($group) {
+            $pool->add(function() use ($group) {
                 return $this->_executeCommand($this->dnr_path.'releases  '.$group['id'].'"');
-            }, 2000000)->then(function ($output) use ($maxWork) {
+            }, 2000000)->then(function($output) use ($maxWork) {
                 echo $output;
                 $this->colorCli->primary('Task #'.$maxWork.' Finished performing release processing');
-            })->catch(function (\Throwable $exception) {
+            })->catch(function(\Throwable $exception) {
                 echo $exception->getMessage();
-            })->catch(static function (SerializableException $serializableException) {
+            })->catch(static function(SerializableException $serializableException) {
                 //we do nothing here just catch the error and move on
             });
             $maxWork--;
@@ -637,16 +637,16 @@ 
         $this->processWork();
         foreach ($releases as $release) {
             if ($type !== '') {
-                $pool->add(function () use ($release, $type) {
+                $pool->add(function() use ($release, $type) {
                     return $this->_executeCommand(PHP_BINARY.' misc/update/postprocess.php '.$type.$release->id);
-                }, 2000000)->then(function ($output) use ($desc, $count) {
+                }, 2000000)->then(function($output) use ($desc, $count) {
                     echo $output;
                     $this->colorCli->primary('Finished task #'.$count.' for '.$desc);
-                })->catch(function (\Throwable $exception) {
+                })->catch(function(\Throwable $exception) {
                     echo $exception->getMessage();
-                })->catch(static function (SerializableException $serializableException) {
+                })->catch(static function(SerializableException $serializableException) {
                     //we do nothing here just catch the error and move on
-                })->timeout(function () use ($count) {
+                })->timeout(function() use ($count) {
                     $this->colorCli->notice('Task #'.$count.': Timeout occurred.');
                 });
                 $count--;
@@ -894,15 +894,15 @@ 
         $pool = Pool::create()->concurrency($maxProcess)->timeout(config('nntmux.multiprocessing_max_child_time'));
         $this->processWork();
         foreach ($this->work as $group) {
-            $pool->add(function () use ($group) {
+            $pool->add(function() use ($group) {
                 return $this->_executeCommand($this->dnr_path.'update_per_group  '.$group->id.'"');
-            }, 2000000)->then(function ($output) use ($group) {
+            }, 2000000)->then(function($output) use ($group) {
                 echo $output;
                 $name = UsenetGroup::getNameByID($group->id);
                 $this->colorCli->primary('Finished updating binaries, processing releases and additional postprocessing for group:'.$name);
-            })->catch(function (\Throwable $exception) {
+            })->catch(function(\Throwable $exception) {
                 echo $exception->getMessage();
-            })->catch(static function (SerializableException $serializableException) {
+            })->catch(static function(SerializableException $serializableException) {
                 echo $serializableException->asThrowable()->getMessage();
             });
         }
@@ -918,7 +918,7 @@ 
     {
         $process = Process::fromShellCommandline($command);
         $process->setTimeout(1800);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             if ($type === Process::ERR) {
                 echo $buffer;
             }

app/Models/User.php

Spacing +14 added lines, -14 removed lines

@@ -250,7 +250,7 @@ 
     {
         $res = self::query()->where('email', '<>', 'sharing@nZEDb.com');
 
-        if (! empty($role)) {
+        if (!empty($role)) {
             $res->where('roles_id', $role);
         }
 
@@ -291,7 +291,7 @@ 
             'rate_limit' => $rateLimit ? $rateLimit['rate_limit'] : 60,
         ];
 
-        if (! empty($email)) {
+        if (!empty($email)) {
             $email = trim($email);
             $sql += ['email' => $email];
         }
@@ -336,10 +336,10 @@ 
     {
         $user = self::find($uid);
         $currRoleExp = $user->rolechangedate ?? now()->toDateTimeString();
-        if (! empty($date)) {
+        if (!empty($date)) {
             $user->update(['rolechangedate' => $date]);
         }
-        if (empty($date) && ! empty($addYear)) {
+        if (empty($date) && !empty($addYear)) {
             $user->update(['rolechangedate' => Carbon::createFromDate($currRoleExp)->addYears($addYear)]);
         }
     }
@@ -396,10 +396,10 @@ 
         return self::fromQuery(
             sprintf(
                 $query,
-                ! empty($userName) ? 'AND users.username '.'LIKE '.escapeString('%'.$userName.'%') : '',
-                ! empty($email) ? 'AND users.email '.'LIKE '.escapeString('%'.$email.'%') : '',
-                ! empty($host) ? 'AND users.host '.'LIKE '.escapeString('%'.$host.'%') : '',
-                (! empty($role) ? ('AND users.roles_id = '.$role) : ''),
+                !empty($userName) ? 'AND users.username '.'LIKE '.escapeString('%'.$userName.'%') : '',
+                !empty($email) ? 'AND users.email '.'LIKE '.escapeString('%'.$email.'%') : '',
+                !empty($host) ? 'AND users.host '.'LIKE '.escapeString('%'.$host.'%') : '',
+                (!empty($role) ? ('AND users.roles_id = '.$role) : ''),
                 $order[0],
                 $order[1],
                 ($start === false ? '' : ('LIMIT '.$offset.' OFFSET '.$start))
@@ -511,7 +511,7 @@ 
 
     public static function isValidUrl($url): bool
     {
-        return (! preg_match('/^(http|https|ftp):\/\/([A-Z0-9][A-Z0-9_-]*(?:\.[A-Z0-9][A-Z0-9_-]*)+):?(\d+)?\/?/i', $url)) ? false : true;
+        return (!preg_match('/^(http|https|ftp):\/\/([A-Z0-9][A-Z0-9_-]*(?:\.[A-Z0-9][A-Z0-9_-]*)+):?(\d+)?\/?/i', $url)) ? false : true;
     }
 
     /**
@@ -547,7 +547,7 @@ 
 
         // Make sure this is the last check, as if a further validation check failed, the invite would still have been used up.
         $invitedBy = 0;
-        if (! $forceInviteMode && (int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_INVITE) {
+        if (!$forceInviteMode && (int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_INVITE) {
             if ($inviteCode === '') {
                 return self::ERR_SIGNUP_BADINVITECODE;
             }
@@ -567,7 +567,7 @@ 
     public static function checkAndUseInvite(string $inviteCode): int
     {
         $invite = Invitation::getInvite($inviteCode);
-        if (! $invite) {
+        if (!$invite) {
             return -1;
         }
 
@@ -583,7 +583,7 @@ 
     public static function add(string $userName, string $password, string $email, int $role, ?string $notes = '', string $host = '', int $invites = Invitation::DEFAULT_INVITES, int $invitedBy = 0)
     {
         $password = self::hashPassword($password);
-        if (! $password) {
+        if (!$password) {
             return false;
         }
 
@@ -625,9 +625,9 @@ 
 
         $cats = ['view console', 'view movies', 'view audio', 'view tv', 'view pc', 'view adult', 'view books', 'view other'];
 
-        if (! empty($allowed)) {
+        if (!empty($allowed)) {
             foreach ($cats as $cat) {
-                if (! \in_array($cat, $allowed, false)) {
+                if (!\in_array($cat, $allowed, false)) {
                     $ret[] = match ($cat) {
                         'view console' => 1000,
                         'view movies' => 2000,

Blacklight/ReleaseRemover.php

Spacing +8 added lines, -8 removed lines

@@ -154,7 +154,7 @@ 
                 $this->colorCLI->header('Removing '.($type === '' ? 'All crap releases ' : $type.' crap releases').' - no time limit.', true);
             }
         } else {
-            if (! is_numeric($time)) {
+            if (!is_numeric($time)) {
                 $this->error = 'Error, time must be a number or full.';
 
                 return $this->returnError();
@@ -630,7 +630,7 @@ 
     {
         $status = sprintf('AND status = %d', Binaries::BLACKLIST_ENABLED);
 
-        if (! empty($this->blacklistID) && $this->delete === false) {
+        if (!empty($this->blacklistID) && $this->delete === false) {
             $status = '';
         }
 
@@ -727,7 +727,7 @@ 
                         $searchResult = (new ElasticSearchSiteSearch())->indexSearch($regexMatch, 100);
                     } else {
                         $searchResult = (new ManticoreSearch())->searchIndexes('releases_rt', $regexMatch, ['name,searchname']);
-                        if (! empty($searchResult)) {
+                        if (!empty($searchResult)) {
                             $searchResult = Arr::wrap(Arr::get($searchResult, 'id'));
                         }
                     }
@@ -741,7 +741,7 @@ 
 							SELECT r.guid, r.searchname, r.id
 							FROM releases r %s %s %s %s',
                     $regexSQL,
-                    ! empty($searchResult) ? ' WHERE r.id IN ('.implode(',', $searchResult).')' : '',
+                    !empty($searchResult) ? ' WHERE r.id IN ('.implode(',', $searchResult).')' : '',
                     $groupID,
                     $this->crapTime,
                 );
@@ -1107,7 +1107,7 @@ 
                     }
                     break;
                 case 'size':
-                    if (! is_numeric($args[2])) {
+                    if (!is_numeric($args[2])) {
                         break;
                     }
                     switch ($args[1]) {
@@ -1122,7 +1122,7 @@ 
                     }
                     break;
                 case 'adddate':
-                    if (! is_numeric($args[2])) {
+                    if (!is_numeric($args[2])) {
                         break;
                     }
                     switch ($args[1]) {
@@ -1135,7 +1135,7 @@ 
                     }
                     break;
                 case 'postdate':
-                    if (! is_numeric($args[2])) {
+                    if (!is_numeric($args[2])) {
                         break;
                     }
                     switch ($args[1]) {
@@ -1148,7 +1148,7 @@ 
                     }
                     break;
                 case 'completion':
-                    if (! is_numeric($args[2])) {
+                    if (!is_numeric($args[2])) {
                         break;
                     }
                     if ($args[1] === 'smaller') {

Blacklight/utility/Utility.php

Spacing +5 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
         $themes = scandir(base_path().'/resources/views/themes', SCANDIR_SORT_ASCENDING);
         $themeList[] = 'None';
         foreach ($themes as $theme) {
-            if (! str_contains($theme, '.') && ! \in_array($theme, $ignoredThemes, false) && File::isDirectory(base_path().'/resources/views/themes/'.$theme)) {
+            if (!str_contains($theme, '.') && !\in_array($theme, $ignoredThemes, false) && File::isDirectory(base_path().'/resources/views/themes/'.$theme)) {
                 $themeList[] = $theme;
             }
         }
@@ -39,12 +39,12 @@ 
         $string = '';
         $gzFile = @gzopen($filePath, 'rb', 0);
         if ($gzFile) {
-            while (! gzeof($gzFile)) {
+            while (!gzeof($gzFile)) {
                 $temp = gzread($gzFile, 1024);
                 // Check for empty string.
                 // Without this the loop would be endless and consume 100% CPU.
                 // Do not set $string empty here, as the data might still be good.
-                if (! $temp) {
+                if (!$temp) {
                     break;
                 }
                 $string .= $temp;
@@ -102,15 +102,14 @@ 
         $fileSpecTemplate = '%s/%s%s';
         $fileSpec = '';
 
-        if (! empty($options['id']) && \in_array(
+        if (!empty($options['id']) && \in_array(
             $options['type'],
             ['anime', 'audio', 'audiosample', 'book', 'console', 'games', 'movies', 'music', 'preview', 'sample', 'tvrage', 'video', 'xxx'],
             false
         )
         ) {
             $fileSpec = sprintf($fileSpecTemplate, $options['type'], $options['id'], $options['suffix']);
-            $fileSpec = file_exists(storage_path('covers/').$fileSpec) ? $fileSpec :
-                sprintf($fileSpecTemplate, $options['type'], 'no', $options['suffix']);
+            $fileSpec = file_exists(storage_path('covers/').$fileSpec) ? $fileSpec : sprintf($fileSpecTemplate, $options['type'], 'no', $options['suffix']);
         }
 
         return $fileSpec;

Blacklight/Binaries.php

Spacing +25 added lines, -25 removed lines

@@ -377,7 +377,7 @@ 
 
             $done = false;
             // Get all the parts (in portions of $this->messageBuffer to not use too much memory).
-            while (! $done) {
+            while (!$done) {
                 // Increment last until we reach $groupLast (group newest article).
                 if ($total > $this->messageBuffer) {
                     if ((string) ($first + $this->messageBuffer) > $groupLast) {
@@ -401,7 +401,7 @@ 
                 $scanSummary = $this->scan($groupMySQL, $first, $last);
 
                 // Check if we fetched headers.
-                if (! empty($scanSummary)) {
+                if (!empty($scanSummary)) {
                     // If new group, update first record & postdate
                     if ($groupMySQL['first_record_postdate'] === null && (int) $groupMySQL['first_record'] === 0) {
                         $groupMySQL['first_record'] = $scanSummary['firstArticleNumber'];
@@ -425,7 +425,7 @@ 
                     }
 
                     $scanSummary['lastArticleDate'] = (isset($scanSummary['lastArticleDate']) ? strtotime($scanSummary['lastArticleDate']) : false);
-                    if (! is_numeric($scanSummary['lastArticleDate'])) {
+                    if (!is_numeric($scanSummary['lastArticleDate'])) {
                         $scanSummary['lastArticleDate'] = $this->postdate($scanSummary['lastArticleNumber'], $groupNNTP);
                     }
 
@@ -574,7 +574,7 @@ 
 
             // If set we are running in partRepair mode.
             if ($partRepair && $missingParts !== null) {
-                if (! \in_array($header['Number'], $missingParts, false)) {
+                if (!\in_array($header['Number'], $missingParts, false)) {
                     // If article isn't one that is missing skip it.
                     continue;
                 }
@@ -619,15 +619,15 @@ 
 
         unset($headers); // Reclaim memory now that headers are split.
 
-        if (! empty($this->_binaryBlacklistIdsToUpdate)) {
+        if (!empty($this->_binaryBlacklistIdsToUpdate)) {
             $this->updateBlacklistUsage();
         }
 
-        if ($this->_echoCLI && ! $partRepair) {
+        if ($this->_echoCLI && !$partRepair) {
             $this->outputHeaderInitial();
         }
 
-        if (! empty($stdHeaders)) {
+        if (!empty($stdHeaders)) {
             $this->storeHeaders($stdHeaders);
         }
         unset($stdHeaders);
@@ -702,7 +702,7 @@ 
         // Loop articles, figure out files/parts.
         foreach ($headers as $this->header) {
             // Set up the info for inserting into parts/binaries/collections tables.
-            if (! isset($articles[$this->header['matches'][1]])) {
+            if (!isset($articles[$this->header['matches'][1]])) {
                 // Attempt to find the file count. If it is not found, set it to 0.
                 $fileCount = $this->getFileCount($this->header['matches'][1]);
                 if ($fileCount[1] === 0 && $fileCount[3] === 0) {
@@ -717,7 +717,7 @@ 
                 $this->header['CollectionKey'] = $collMatch['name'].$fileCount[3];
 
                 // If this header's collection key isn't in memory, attempt to insert the collection
-                if (! isset($collectionIDs[$this->header['CollectionKey']])) {
+                if (!isset($collectionIDs[$this->header['CollectionKey']])) {
                     /* Date from header should be a string this format:
                      * 31 Mar 2014 15:36:04 GMT or 6 Oct 1998 04:38:40 -0500
                      * Still make sure it's not unix time, convert it to unix time if it is.
@@ -748,7 +748,7 @@ 
 
                     $finalXrefArray = [];
                     foreach ($tempHeaderXrefs as $tempHeaderXref) {
-                        if (! in_array($tempHeaderXref, $tempXrefsData, false)) {
+                        if (!in_array($tempHeaderXref, $tempXrefsData, false)) {
                             $finalXrefArray[] = $tempHeaderXref;
                         }
                     }
@@ -888,12 +888,12 @@ 
         $iterator1 = 0;
         $iterator2 = $msgCount - 1;
         while (true) {
-            if (! isset($returnArray['firstArticleNumber']) && isset($headers[$iterator1]['Number'])) {
+            if (!isset($returnArray['firstArticleNumber']) && isset($headers[$iterator1]['Number'])) {
                 $returnArray['firstArticleNumber'] = $headers[$iterator1]['Number'];
                 $returnArray['firstArticleDate'] = $headers[$iterator1]['Date'];
             }
 
-            if (! isset($returnArray['lastArticleNumber']) && isset($headers[$iterator2]['Number'])) {
+            if (!isset($returnArray['lastArticleNumber']) && isset($headers[$iterator2]['Number'])) {
                 $returnArray['lastArticleNumber'] = $headers[$iterator2]['Number'];
                 $returnArray['lastArticleDate'] = $headers[$iterator2]['Date'];
             }
@@ -1067,7 +1067,7 @@ 
         }
 
         // Remove articles that we cant fetch after x attempts.
-        DB::transaction(function () use ($groupArr) {
+        DB::transaction(function() use ($groupArr) {
             DB::delete(
                 sprintf(
                     'DELETE FROM missed_parts WHERE attempts >= %d AND groups_id = %d',
@@ -1106,14 +1106,14 @@ 
                     $currentPost
                 )
             );
-            if (! empty($local) && \count($local) > 0) {
+            if (!empty($local) && \count($local) > 0) {
                 $date = $local[0]->date;
                 break;
             }
 
             // If we could not find it locally, try usenet.
             $header = $this->_nntp->getXOVER($currentPost);
-            if (! $this->_nntp::isError($header) && isset($header[0]['Date']) && $header[0]['Date'] !== '') {
+            if (!$this->_nntp::isError($header) && isset($header[0]['Date']) && $header[0]['Date'] !== '') {
                 $date = $header[0]['Date'];
                 break;
             }
@@ -1138,7 +1138,7 @@ 
         } while ($attempts++ <= 20);
 
         // If we didn't get a date, set it to now.
-        if (! $date) {
+        if (!$date) {
             $date = time();
         } else {
             $date = strtotime($date);
@@ -1201,7 +1201,7 @@ 
             $articleTime = $this->postdate($wantedArticle, $data);
 
             // Article doesn't exist, start again with something random
-            if (! $articleTime) {
+            if (!$articleTime) {
                 $wantedArticle = random_int($aMin, $aMax);
                 $articleTime = $this->postdate($wantedArticle, $data);
             }
@@ -1273,7 +1273,7 @@ 
         foreach ($numbers as $number) {
             $sql .= $number.',';
         }
-        DB::transaction(static function () use ($groupID, $sql) {
+        DB::transaction(static function() use ($groupID, $sql) {
             DB::delete(rtrim($sql, ',').') AND groups_id = '.$groupID);
         }, 10);
     }
@@ -1288,10 +1288,10 @@ 
      */
     protected function _retrieveBlackList(string $groupName): void
     {
-        if (! isset($this->blackList[$groupName])) {
+        if (!isset($this->blackList[$groupName])) {
             $this->blackList[$groupName] = $this->getBlacklist(true, self::OPTYPE_BLACKLIST, $groupName, true);
         }
-        if (! isset($this->whiteList[$groupName])) {
+        if (!isset($this->whiteList[$groupName])) {
             $this->whiteList[$groupName] = $this->getBlacklist(true, self::OPTYPE_WHITELIST, $groupName, true);
         }
         $this->_listsFound[$groupName] = ($this->blackList[$groupName] || $this->whiteList[$groupName]);
@@ -1305,10 +1305,10 @@ 
      */
     public function isBlackListed(array $msg, string $groupName): bool
     {
-        if (! isset($this->_listsFound[$groupName])) {
+        if (!isset($this->_listsFound[$groupName])) {
             $this->_retrieveBlackList($groupName);
         }
-        if (! $this->_listsFound[$groupName]) {
+        if (!$this->_listsFound[$groupName]) {
             return false;
         }
 
@@ -1336,7 +1336,7 @@ 
 
         // Check if the field is blacklisted.
 
-        if (! $blackListed && $this->blackList[$groupName]) {
+        if (!$blackListed && $this->blackList[$groupName]) {
             foreach ($this->blackList[$groupName] as $blackList) {
                 if (preg_match('/'.$blackList->regex.'/i', $field[$blackList->msgcol])) {
                     $blackListed = true;
@@ -1446,7 +1446,7 @@ 
      */
     public function delete(int $collectionID): void
     {
-        DB::transaction(static function () use ($collectionID) {
+        DB::transaction(static function() use ($collectionID) {
             DB::delete(sprintf('DELETE FROM collections WHERE id = %d', $collectionID));
         }, 10);
 
@@ -1493,7 +1493,7 @@ 
 
     private function getFileCount($subject): array
     {
-        if (! preg_match('/[[(\s](\d{1,5})(\/|[\s_]of[\s_]|-)(\d{1,5})[])\s$:]/i', $subject, $fileCount)) {
+        if (!preg_match('/[[(\s](\d{1,5})(\/|[\s_]of[\s_]|-)(\d{1,5})[])\s$:]/i', $subject, $fileCount)) {
             $fileCount[1] = $fileCount[3] = 0;
         }
 

Blacklight/processing/ProcessReleases.php

Spacing +34 added lines, -34 removed lines

@@ -110,7 +110,7 @@ 
         $this->echoCLI = config('nntmux.echocli');
         $groupID = '';
 
-        if (! empty($groupName)) {
+        if (!empty($groupName)) {
             $groupInfo = UsenetGroup::getByName($groupName);
             if ($groupInfo !== null) {
                 $groupID = $groupInfo['id'];
@@ -121,7 +121,7 @@ 
             $this->colorCLI->header('Starting release update process ('.now()->format('Y-m-d H:i:s').')');
         }
 
-        if (! file_exists(Settings::settingValue('..nzbpath'))) {
+        if (!file_exists(Settings::settingValue('..nzbpath'))) {
             if ($this->echoCLI) {
                 $this->colorCLI->error('Bad or missing nzb directory - '.Settings::settingValue('..nzbpath'));
             }
@@ -182,7 +182,7 @@ 
         $cat = new Categorize();
         $categorized = $total = 0;
         $releasesQuery = Release::query()->where(['categories_id' => Category::OTHER_MISC, 'iscategorized' => 0]);
-        if (! empty($groupId)) {
+        if (!empty($groupId)) {
             $releasesQuery->where('groups_id', $groupId);
         }
         $releases = $releasesQuery->select(['id', 'fromname', 'groups_id', $type])->get();
@@ -218,7 +218,7 @@ 
             $this->colorCLI->header('Process Releases -> Attempting to find complete collections.');
         }
 
-        $where = (! empty($groupID) ? ' AND c.groups_id = '.$groupID.' ' : ' ');
+        $where = (!empty($groupID) ? ' AND c.groups_id = '.$groupID.' ' : ' ');
 
         $this->processStuckCollections($groupID);
         $this->collectionFileCheckStage1($groupID);
@@ -231,7 +231,7 @@ 
         if ($this->echoCLI) {
             $countQuery = Collection::query()->where('filecheck', self::COLLFC_COMPPART);
 
-            if (! empty($groupID)) {
+            if (!empty($groupID)) {
                 $countQuery->where('groups_id', $groupID);
             }
             $count = $countQuery->count('id');
@@ -258,7 +258,7 @@ 
             $this->colorCLI->header('Process Releases -> Calculating collection sizes (in bytes).');
         }
         // Get the total size in bytes of the collection for collections where filecheck = 2.
-        DB::transaction(function () use ($groupID, $startTime) {
+        DB::transaction(function() use ($groupID, $startTime) {
             $checked = DB::update(
                 sprintf(
                     '
@@ -274,7 +274,7 @@ 
 				AND c.filesize = 0 %s',
                     self::COLLFC_SIZED,
                     self::COLLFC_COMPPART,
-                    (! empty($groupID) ? ' AND c.groups_id = '.$groupID : ' ')
+                    (!empty($groupID) ? ' AND c.groups_id = '.$groupID : ' ')
                 )
             );
             if ($checked > 0 && $this->echoCLI) {
@@ -313,16 +313,16 @@ 
 
             $groupMinimums = UsenetGroup::getGroupByID($grpID['id']);
             if ($groupMinimums !== null) {
-                if (! empty($groupMinimums['minsizetoformrelease']) && $groupMinimums['minsizetoformrelease'] > 0) {
+                if (!empty($groupMinimums['minsizetoformrelease']) && $groupMinimums['minsizetoformrelease'] > 0) {
                     $groupMinSizeSetting = (int) $groupMinimums['minsizetoformrelease'];
                 }
-                if (! empty($groupMinimums['minfilestoformrelease']) && $groupMinimums['minfilestoformrelease'] > 0) {
+                if (!empty($groupMinimums['minfilestoformrelease']) && $groupMinimums['minfilestoformrelease'] > 0) {
                     $groupMinFilesSetting = (int) $groupMinimums['minfilestoformrelease'];
                 }
             }
 
             if (Collection::query()->where('filecheck', self::COLLFC_SIZED)->where('filesize', '>', 0)->first() !== null) {
-                DB::transaction(function () use (
+                DB::transaction(function() use (
                     $groupMinSizeSetting,
                     $minSizeSetting,
                     $minSizeDeleted,
@@ -395,7 +395,7 @@ 
         $collectionsQuery = Collection::query()
             ->where('collections.filecheck', self::COLLFC_SIZED)
             ->where('collections.filesize', '>', 0);
-        if (! empty($groupID)) {
+        if (!empty($groupID)) {
             $collectionsQuery->where('collections.groups_id', $groupID);
         }
         $collectionsQuery->select(['collections.*', 'usenet_groups.name as gname'])
@@ -450,7 +450,7 @@ 
                 $releaseID = Release::insertRelease(
                     [
                         'name' => $cleanRelName,
-                        'searchname' => ! empty($cleanedName) ? mb_convert_encoding($cleanedName, 'UTF-8', mb_list_encodings()) : $cleanRelName,
+                        'searchname' => !empty($cleanedName) ? mb_convert_encoding($cleanedName, 'UTF-8', mb_list_encodings()) : $cleanRelName,
                         'totalpart' => $collection->totalfiles,
                         'groups_id' => $collection->groups_id,
                         'guid' => createGUID(),
@@ -466,7 +466,7 @@ 
 
                 if ($releaseID !== null) {
                     // Update collections table to say we inserted the release.
-                    DB::transaction(static function () use ($collection, $releaseID) {
+                    DB::transaction(static function() use ($collection, $releaseID) {
                         Collection::query()->where('id', $collection->id)->update(['filecheck' => self::COLLFC_INSERTED, 'releases_id' => $releaseID]);
                     }, 10);
 
@@ -527,7 +527,7 @@ 
                 }
             } else {
                 // The release was already in the DB, so delete the collection.
-                DB::transaction(static function () use ($collection) {
+                DB::transaction(static function() use ($collection) {
                     Collection::query()->where('collectionhash', $collection->collectionhash)->delete();
                 }, 10);
 
@@ -568,7 +568,7 @@ 
         }
 
         $releasesQuery = Release::query()->with('category.parent')->where('nzbstatus', '=', 0);
-        if (! empty($groupID)) {
+        if (!empty($groupID)) {
             $releasesQuery->where('releases.groups_id', $groupID);
         }
         $releases = $releasesQuery->select(['id', 'guid', 'name', 'categories_id'])->get();
@@ -671,7 +671,7 @@ 
                 ), true);
         }
 
-        DB::transaction(function () use ($deletedCount, $startTime) {
+        DB::transaction(function() use ($deletedCount, $startTime) {
             $deleted = 0;
             $deleteQuery = Collection::query()
                 ->where('dateadded', '<', now()->subHours(Settings::settingValue('..partretentionhours')))
@@ -834,7 +834,7 @@ 
             $releases = Release::query()
                 ->select(['id', 'guid'])
                 ->where('passwordstatus', '=', Releases::PASSWD_RAR)
-                ->orWhereIn('id', function ($query) {
+                ->orWhereIn('id', function($query) {
                     $query->select('releases_id')
                         ->from('release_files')
                         ->where('passworded', '=', Releases::PASSWD_RAR);
@@ -893,7 +893,7 @@ 
             foreach ($genrelist as $genre) {
                 $musicInfoQuery = MusicInfo::query()->where('genre_id', (int) $genre['id'])->select(['id']);
                 $releases = Release::query()
-                    ->joinSub($musicInfoQuery, 'mi', function ($join) {
+                    ->joinSub($musicInfoQuery, 'mi', function($join) {
                         $join->on('releases.musicinfo_id', '=', 'mi.id');
                     })
                     ->select(['releases.id', 'releases.guid'])
@@ -979,18 +979,18 @@ 
      */
     private function collectionFileCheckStage1(int $groupID): void
     {
-        DB::transaction(static function () use ($groupID) {
+        DB::transaction(static function() use ($groupID) {
             $collectionsCheck = Collection::query()->select(['collections.id'])
                 ->join('binaries', 'binaries.collections_id', '=', 'collections.id')
                 ->where('collections.totalfiles', '>', 0)
                 ->where('collections.filecheck', '=', self::COLLFC_DEFAULT);
-            if (! empty($groupID)) {
+            if (!empty($groupID)) {
                 $collectionsCheck->where('collections.groups_id', $groupID);
             }
             $collectionsCheck->groupBy('binaries.collections_id', 'collections.totalfiles', 'collections.id')
                 ->havingRaw('COUNT(binaries.id) IN (collections.totalfiles, collections.totalfiles+1)');
 
-            Collection::query()->joinSub($collectionsCheck, 'r', function ($join) {
+            Collection::query()->joinSub($collectionsCheck, 'r', function($join) {
                 $join->on('collections.id', '=', 'r.id');
             })->update(['collections.filecheck' => self::COLLFC_COMPCOLL]);
         }, 10);
@@ -1011,25 +1011,25 @@ 
      */
     private function collectionFileCheckStage2(int $groupID): void
     {
-        DB::transaction(static function () use ($groupID) {
+        DB::transaction(static function() use ($groupID) {
             $collectionsCheck = Collection::query()->select(['collections.id'])
                 ->join('binaries', 'binaries.collections_id', '=', 'collections.id')
                 ->where('binaries.filenumber', '=', 0)
                 ->where('collections.totalfiles', '>', 0)
                 ->where('collections.filecheck', '=', self::COLLFC_COMPCOLL);
-            if (! empty($groupID)) {
+            if (!empty($groupID)) {
                 $collectionsCheck->where('collections.groups_id', $groupID);
             }
             $collectionsCheck->groupBy('collections.id');
 
-            Collection::query()->joinSub($collectionsCheck, 'r', function ($join) {
+            Collection::query()->joinSub($collectionsCheck, 'r', function($join) {
                 $join->on('collections.id', '=', 'r.id');
             })->update(['collections.filecheck' => self::COLLFC_ZEROPART]);
         }, 10);
 
-        DB::transaction(static function () use ($groupID) {
+        DB::transaction(static function() use ($groupID) {
             $collectionQuery = Collection::query()->where('filecheck', '=', self::COLLFC_COMPCOLL);
-            if (! empty($groupID)) {
+            if (!empty($groupID)) {
                 $collectionQuery->where('groups_id', $groupID);
             }
             $collectionQuery->update(['filecheck' => self::COLLFC_TEMPCOMP]);
@@ -1047,7 +1047,7 @@ 
      */
     private function collectionFileCheckStage3(string $where): void
     {
-        DB::transaction(static function () use ($where) {
+        DB::transaction(static function() use ($where) {
             DB::update(
                 sprintf(
                     '
@@ -1071,7 +1071,7 @@ 
             );
         }, 10);
 
-        DB::transaction(static function () use ($where) {
+        DB::transaction(static function() use ($where) {
             DB::update(
                 sprintf(
                     '
@@ -1108,7 +1108,7 @@ 
      */
     private function collectionFileCheckStage4(string &$where): void
     {
-        DB::transaction(static function () use ($where) {
+        DB::transaction(static function() use ($where) {
             DB::update(
                 sprintf(
                     '
@@ -1138,9 +1138,9 @@ 
      */
     private function collectionFileCheckStage5(int $groupId): void
     {
-        DB::transaction(static function () use ($groupId) {
+        DB::transaction(static function() use ($groupId) {
             $collectionQuery = Collection::query()->whereIn('filecheck', [self::COLLFC_TEMPCOMP, self::COLLFC_ZEROPART]);
-            if (! empty($groupId)) {
+            if (!empty($groupId)) {
                 $collectionQuery->where('groups_id', $groupId);
             }
             $collectionQuery->update(['filecheck' => self::COLLFC_COMPCOLL]);
@@ -1158,7 +1158,7 @@ 
      */
     private function collectionFileCheckStage6(string &$where): void
     {
-        DB::transaction(function () use ($where) {
+        DB::transaction(function() use ($where) {
             DB::update(
                 sprintf(
                     "
@@ -1188,10 +1188,10 @@ 
     {
         $lastRun = Settings::settingValue('indexer.processing.last_run_time');
 
-        DB::transaction(function () use ($groupID, $lastRun) {
+        DB::transaction(function() use ($groupID, $lastRun) {
             $objQuery = Collection::query()
                 ->where('added', '<', Carbon::createFromFormat('Y-m-d H:i:s', $lastRun)->subHours($this->collectionTimeout));
-            if (! empty($groupID)) {
+            if (!empty($groupID)) {
                 $objQuery->where('groups_id', $groupID);
             }
             $obj = $objQuery->delete();

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         Paginator::useBootstrapFive();
         $smarty = app('smarty.view');
         view()->share('smarty', $smarty);
-        Gate::define('viewPulse', function (User $user) {
+        Gate::define('viewPulse', function(User $user) {
             return $user->hasRole('Admin');
         });
     }