NNTmux / newznab-tmux

Blacklight/Binaries.php

Spacing +25 added lines, -25 removed lines

@@ -384,7 +384,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) {
@@ -408,7 +408,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'];
@@ -432,7 +432,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);
                     }
 
@@ -581,7 +581,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;
                 }
@@ -626,15 +626,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);
@@ -709,9 +709,9 @@ 
         // 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.
-                if (! preg_match('/[[(\s](\d{1,5})(\/|[\s_]of[\s_]|-)(\d{1,5})[])\s$:]/i', $this->header['matches'][1], $fileCount)) {
+                if (!preg_match('/[[(\s](\d{1,5})(\/|[\s_]of[\s_]|-)(\d{1,5})[])\s$:]/i', $this->header['matches'][1], $fileCount)) {
                     $fileCount[1] = $fileCount[3] = 0;
                 }
 
@@ -723,7 +723,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.
@@ -754,7 +754,7 @@ 
 
                     $finalXrefArray = [];
                     foreach ($tempHeaderXrefs as $tempHeaderXref) {
-                        if (! in_array($tempHeaderXref, $tempXrefsData, false)) {
+                        if (!in_array($tempHeaderXref, $tempXrefsData, false)) {
                             $finalXrefArray[] = $tempHeaderXref;
                         }
                     }
@@ -891,12 +891,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'];
             }
@@ -1070,7 +1070,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',
@@ -1109,14 +1109,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;
             }
@@ -1141,7 +1141,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);
@@ -1204,7 +1204,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);
             }
@@ -1278,7 +1278,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);
     }
@@ -1293,10 +1293,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]);
@@ -1310,10 +1310,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;
         }
 
@@ -1341,7 +1341,7 @@ 
 
         // Check if the field is black listed.
 
-        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;
@@ -1449,7 +1449,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);
 

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|BD[._ -]?(25|50)?|\bBR\b|Camrip|[._ -]\d{4}[._ -].+(720p|1080p|Cam|HDTS)|DIVX|[._ -]DVD[._ -]|DVD-?(5|9|R|Rip)|Untouched|VHSRip|XVID|[._ -](DTS|TVrip)[._ -]/i', $this->releaseName) && ! preg_match('/auto(cad|desk)|divx[._ -]plus|[._ -]exe$|[._ -](jav|XXX)[._ -]|SWE6RUS|\wXXX(1080p|720p|DVD)|Xilisoft/i', $this->releaseName)) {
+        if (preg_match('/[._ -]AVC|[._ -]|[BH][DR]RIP|Bluray|BD[._ -]?(25|50)?|\bBR\b|Camrip|[._ -]\d{4}[._ -].+(720p|1080p|Cam|HDTS)|DIVX|[._ -]DVD[._ -]|DVD-?(5|9|R|Rip)|Untouched|VHSRip|XVID|[._ -](DTS|TVrip)[._ -]/i', $this->releaseName) && !preg_match('/auto(cad|desk)|divx[._ -]plus|[._ -]exe$|[._ -](jav|XXX)[._ -]|SWE6RUS|\wXXX(1080p|720p|DVD)|Xilisoft/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) && false !== stripos($this->releaseName, '2160p')) {
+        if (!preg_match('/(S\d+).*(2160p).*(Netflix|Amazon).*(TrollUHD|NTb|VLAD)/i', $this->releaseName) && false !== stripos($this->releaseName, '2160p')) {
             $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/Tmux.php

Spacing +5 added lines, -5 removed lines

@@ -280,7 +280,7 @@ 
     {
         $returnVal = shell_exec("which $cmd 2>/dev/null");
 
-        return ! empty($returnVal);
+        return !empty($returnVal);
     }
 
     /**
@@ -339,11 +339,11 @@ 
 
             case 2:
                 $ppminString = $ppmaxString = '';
-                if (is_numeric($ppmax) && ! empty($ppmax)) {
+                if (is_numeric($ppmax) && !empty($ppmax)) {
                     $ppmax *= 1073741824;
                     $ppmaxString = "AND r.size < {$ppmax}";
                 }
-                if (is_numeric($ppmin) && ! empty($ppmin)) {
+                if (is_numeric($ppmin) && !empty($ppmin)) {
                     $ppmin *= 1048576;
                     $ppminString = "AND r.size > {$ppmin}";
                 }
@@ -401,7 +401,7 @@ 
             throw new \RuntimeException('Tmux\\\'s running flag was not found in the database.'.PHP_EOL.'Please check the tables are correctly setup.'.PHP_EOL);
         }
 
-        return ! ((int) $running->value === 0);
+        return !((int) $running->value === 0);
     }
 
     /**
@@ -427,7 +427,7 @@ 
      */
     public function startRunning(): void
     {
-        if (! $this->isRunning()) {
+        if (!$this->isRunning()) {
             Settings::query()->where(['section' => 'site', 'subsection' => 'tmux', 'setting' => 'running'])->update(['value' => 1]);
         }
     }

app/Http/Requests/Auth/RegisterRegisterRequest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      */
     public function rules(): array
     {
-        if (config('captcha.enabled') === true && (! empty(config('captcha.secret')) && ! empty(config('captcha.sitekey')))) {
+        if (config('captcha.enabled') === true && (!empty(config('captcha.secret')) && !empty(config('captcha.sitekey')))) {
             return [
                 'g-recaptcha-response' => [
                     'required',

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)) {
                     switch ($cat) {
                         case 'view console':
                             $ret[] = 1000;