NNTmux / newznab-tmux

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/Releases.php

Spacing +40 added lines, -40 removed lines

@@ -274,7 +274,7 @@ 
 				GROUP BY r.id
 				ORDER BY %s %s %s",
             $this->uSQL($userShows, 'videos_id'),
-            (! empty($excludedCats) ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
+            (!empty($excludedCats) ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
             NZB::NZB_ADDED,
             Category::TV_ROOT,
             Category::TV_OTHER,
@@ -344,7 +344,7 @@ 
     {
         // Delete NZB from disk.
         $nzbPath = $nzb->NZBPath($identifiers['g']);
-        if (! empty($nzbPath)) {
+        if (!empty($nzbPath)) {
             File::delete($nzbPath);
         }
 
@@ -384,7 +384,7 @@ 
      */
     public function updateMulti($guids, $category, $grabs, $videoId, $episodeId, $anidbId, $imdbId)
     {
-        if (! \is_array($guids) || \count($guids) < 1) {
+        if (!\is_array($guids) || \count($guids) < 1) {
             return false;
         }
 
@@ -408,7 +408,7 @@ 
         $sql = '(1=2 ';
         foreach ($userQuery as $query) {
             $sql .= sprintf('OR (r.%s = %d', $type, $query->$type);
-            if (! empty($query->categories)) {
+            if (!empty($query->categories)) {
                 $catsArr = explode('|', $query->categories);
                 if (\count($catsArr) > 1) {
                     $sql .= sprintf(' AND r.categories_id IN (%s)', implode(',', $catsArr));
@@ -452,7 +452,7 @@ 
             $orderBy = $this->getBrowseOrder($orderBy);
         }
 
-        $searchFields = Arr::where($searchArr, static function ($value) {
+        $searchFields = Arr::where($searchArr, static function($value) {
             return $value !== -1;
         });
 
@@ -462,7 +462,7 @@ 
             $searchResult = $this->elasticSearch->indexSearch($phrases, $limit);
         } else {
             $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', '', [], $searchFields);
-            if (! empty($searchResult)) {
+            if (!empty($searchResult)) {
                 $searchResult = Arr::wrap(Arr::get($searchResult, 'id'));
             }
         }
@@ -553,7 +553,7 @@ 
                 $searchResult = $this->elasticSearch->indexSearchApi($searchName, $limit);
             } else {
                 $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $searchName, ['searchname']);
-                if (! empty($searchResult)) {
+                if (!empty($searchResult)) {
                     $searchResult = Arr::wrap(Arr::get($searchResult, 'id'));
                 }
             }
@@ -569,7 +569,7 @@ 
             ((int) $groupName !== -1 ? sprintf(' AND r.groups_id = %d ', UsenetGroup::getIDByName($groupName)) : ''),
             $catQuery,
             (\count($excludedCats) > 0 ? ' AND r.categories_id NOT IN ('.implode(',', $excludedCats).')' : ''),
-            (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
+            (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
             ($minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '')
         );
         $baseSql = sprintf(
@@ -603,7 +603,7 @@ 
         if ($releases !== null) {
             return $releases;
         }
-        if ($searchName !== -1 && ! empty($searchResult)) {
+        if ($searchName !== -1 && !empty($searchResult)) {
             $releases = self::fromQuery($sql);
         } elseif ($searchName !== -1 && empty($searchResult)) {
             $releases = collect();
@@ -653,13 +653,13 @@ 
                 ($airDate !== '' ? sprintf('AND DATE(tve.firstaired) = %s', escapeString($airDate)) : '')
             );
             $show = self::fromQuery($showQry);
-            if (! empty($show[0]) && $show->isNotEmpty()) {
-                if ((! empty($series) || ! empty($episode) || ! empty($airDate)) && $show[0]->episodes !== '') {
+            if (!empty($show[0]) && $show->isNotEmpty()) {
+                if ((!empty($series) || !empty($episode) || !empty($airDate)) && $show[0]->episodes !== '') {
                     $showSql = sprintf('AND r.tv_episodes_id IN (%s)', $show[0]->episodes);
                 } elseif ((int) $show[0]->video > 0) {
                     $showSql = 'AND r.videos_id = '.$show[0]->video;
                     // If $series is set but episode is not, return Season Packs only
-                    if (! empty($series) && empty($episode)) {
+                    if (!empty($series) && empty($episode)) {
                         $showSql .= ' AND r.tv_episodes_id = 0';
                     }
                 } else {
@@ -672,22 +672,22 @@ 
             }
         }
         // If $name is set it is a fallback search, add available SxxExx/airdate info to the query
-        if (! empty($name) && $showSql === '') {
-            if (! empty($series) && (int) $series < 1900) {
+        if (!empty($name) && $showSql === '') {
+            if (!empty($series) && (int) $series < 1900) {
                 $name .= sprintf(' S%s', str_pad($series, 2, '0', STR_PAD_LEFT));
-                if (! empty($episode) && ! str_contains($episode, '/')) {
+                if (!empty($episode) && !str_contains($episode, '/')) {
                     $name .= sprintf('E%s', str_pad($episode, 2, '0', STR_PAD_LEFT));
                 }
-            } elseif (! empty($airDate)) {
+            } elseif (!empty($airDate)) {
                 $name .= sprintf(' %s', str_replace(['/', '-', '.', '_'], ' ', $airDate));
             }
         }
-        if (! empty($name)) {
+        if (!empty($name)) {
             if (config('nntmux.elasticsearch_enabled') === true) {
                 $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit);
             } else {
                 $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']);
-                if (! empty($searchResult)) {
+                if (!empty($searchResult)) {
                     $searchResult = Arr::wrap(Arr::get($searchResult, 'id'));
                 }
             }
@@ -703,11 +703,11 @@ 
             NZB::NZB_ADDED,
             $this->showPasswords(),
             $showSql,
-            (! empty($name) && ! empty($searchResult)) ? 'AND r.id IN ('.implode(',', $searchResult).')' : '',
+            (!empty($name) && !empty($searchResult)) ? 'AND r.id IN ('.implode(',', $searchResult).')' : '',
             (empty($searchResult)) ? Category::getCategorySearch($cat) : '',
             $maxAge > 0 ? sprintf('AND r.postdate > NOW() - INTERVAL %d DAY', $maxAge) : '',
             $minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : '',
-            ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : ''
+            !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : ''
         );
         $baseSql = sprintf(
             "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.videos_id, r.tv_episodes_id, r.haspreview, r.jpgstatus,
@@ -743,7 +743,7 @@ 
         if ($releases !== null) {
             return $releases;
         }
-        $releases = ((! empty($name) && ! empty($searchResult)) || empty($name)) ? self::fromQuery($sql) : [];
+        $releases = ((!empty($name) && !empty($searchResult)) || empty($name)) ? self::fromQuery($sql) : [];
         if (count($releases) !== 0 && $releases->isNotEmpty()) {
             $releases[0]->_totalrows = $this->getPagerCount(
                 preg_replace('#LEFT(\s+OUTER)?\s+JOIN\s+(?!tv_episodes)\s+.*ON.*=.*\n#i', ' ', $baseSql)
@@ -789,12 +789,12 @@ 
             );
             $show = self::fromQuery($showQry);
             if ($show->isNotEmpty()) {
-                if ((! empty($series) || ! empty($episode) || ! empty($airDate)) && $show[0]->episodes !== '') {
+                if ((!empty($series) || !empty($episode) || !empty($airDate)) && $show[0]->episodes !== '') {
                     $showSql = sprintf('AND r.tv_episodes_id IN (%s)', $show[0]->episodes);
                 } elseif ((int) $show[0]->video > 0) {
                     $showSql = 'AND r.videos_id = '.$show[0]->video;
                     // If $series is set but episode is not, return Season Packs only
-                    if (! empty($series) && empty($episode)) {
+                    if (!empty($series) && empty($episode)) {
                         $showSql .= ' AND r.tv_episodes_id = 0';
                     }
                 } else {
@@ -807,22 +807,22 @@ 
             }
         }
         // If $name is set it is a fallback search, add available SxxExx/airdate info to the query
-        if (! empty($name) && $showSql === '') {
-            if (! empty($series) && (int) $series < 1900) {
+        if (!empty($name) && $showSql === '') {
+            if (!empty($series) && (int) $series < 1900) {
                 $name .= sprintf(' S%s', str_pad($series, 2, '0', STR_PAD_LEFT));
-                if (! empty($episode) && ! str_contains($episode, '/')) {
+                if (!empty($episode) && !str_contains($episode, '/')) {
                     $name .= sprintf('E%s', str_pad($episode, 2, '0', STR_PAD_LEFT));
                 }
-            } elseif (! empty($airDate)) {
+            } elseif (!empty($airDate)) {
                 $name .= sprintf(' %s', str_replace(['/', '-', '.', '_'], ' ', $airDate));
             }
         }
-        if (! empty($name)) {
+        if (!empty($name)) {
             if (config('nntmux.elasticsearch_enabled') === true) {
                 $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit);
             } else {
                 $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']);
-                if (! empty($searchResult)) {
+                if (!empty($searchResult)) {
                     $searchResult = Arr::wrap(Arr::get($searchResult, 'id'));
                 }
             }
@@ -838,11 +838,11 @@ 
             NZB::NZB_ADDED,
             $this->showPasswords(),
             $showSql,
-            (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
+            (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
             Category::getCategorySearch($cat),
             ($maxAge > 0 ? sprintf('AND r.postdate > NOW() - INTERVAL %d DAY', $maxAge) : ''),
             ($minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : ''),
-            ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : ''
+            !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : ''
         );
         $baseSql = sprintf(
             "SELECT r.searchname, r.guid, r.postdate, r.groups_id, r.categories_id, r.size, r.totalpart, r.fromname, r.passwordstatus, r.grabs, r.comments, r.adddate, r.tv_episodes_id, r.haspreview, r.jpgstatus,
@@ -892,12 +892,12 @@ 
      */
     public function animeSearch($aniDbID, int $offset = 0, int $limit = 100, string $name = '', array $cat = [-1], int $maxAge = -1, array $excludedCategories = []): mixed
     {
-        if (! empty($name)) {
+        if (!empty($name)) {
             if (config('nntmux.elasticsearch_enabled') === true) {
                 $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit);
             } else {
                 $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']);
-                if (! empty($searchResult)) {
+                if (!empty($searchResult)) {
                     $searchResult = Arr::wrap(Arr::get($searchResult, 'id'));
                 }
             }
@@ -914,8 +914,8 @@ 
             $this->showPasswords(),
             NZB::NZB_ADDED,
             ($aniDbID > -1 ? sprintf(' AND r.anidbid = %d ', $aniDbID) : ''),
-            (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
-            ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '',
+            (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
+            !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '',
             Category::getCategorySearch($cat),
             ($maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '')
         );
@@ -964,12 +964,12 @@ 
      */
     public function moviesSearch(int $imDbId = -1, int $tmDbId = -1, int $traktId = -1, int $offset = 0, int $limit = 100, string $name = '', array $cat = [-1], int $maxAge = -1, int $minSize = 0, array $excludedCategories = []): mixed
     {
-        if (! empty($name)) {
+        if (!empty($name)) {
             if (config('nntmux.elasticsearch_enabled') === true) {
                 $searchResult = $this->elasticSearch->indexSearchTMA($name, $limit);
             } else {
                 $searchResult = $this->manticoreSearch->searchIndexes('releases_rt', $name, ['searchname']);
-                if (! empty($searchResult)) {
+                if (!empty($searchResult)) {
                     $searchResult = Arr::wrap(Arr::get($searchResult, 'id'));
                 }
             }
@@ -986,11 +986,11 @@ 
 			%s %s %s %s %s %s %s',
             NZB::NZB_ADDED,
             $this->showPasswords(),
-            (! empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
+            (!empty($searchResult) ? 'AND r.id IN ('.implode(',', $searchResult).')' : ''),
             ($imDbId !== -1 && is_numeric($imDbId)) ? sprintf(' AND m.imdbid = \'%s\' ', $imDbId) : '',
             ($tmDbId !== -1 && is_numeric($tmDbId)) ? sprintf(' AND m.tmdbid = %d ', $tmDbId) : '',
             ($traktId !== -1 && is_numeric($traktId)) ? sprintf(' AND m.traktid = %d ', $traktId) : '',
-            ! empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '',
+            !empty($excludedCategories) ? sprintf('AND r.categories_id NOT IN('.implode(',', $excludedCategories).')') : '',
             Category::getCategorySearch($cat),
             $maxAge > 0 ? sprintf(' AND r.postdate > NOW() - INTERVAL %d DAY ', $maxAge) : '',
             $minSize > 0 ? sprintf('AND r.size >= %d', $minSize) : ''
@@ -1042,7 +1042,7 @@ 
             $parentCat = $catRow['root_categories_id'];
 
             $results = $this->search(['searchname' => getSimilarName($name)], -1, '', '', -1, -1, 0, config('nntmux.items_per_page'), '', -1, $excludedCats, 'basic', [$parentCat]);
-            if (! $results) {
+            if (!$results) {
                 return $ret;
             }
 

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');
         });
     }

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
         if (empty($email) && empty($rssToken)) {
             app('smarty.view')->assign('error', 'Missing parameter (email and/or apikey) to send password reset');
         } else {
-            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')))) {
                 $this->validate($request, [
                     'g-recaptcha-response' => 'required|captcha',
                 ]);
@@ -54,7 +54,7 @@ 
             //
             // Check users exists and send an email
             //
-            $ret = ! empty($rssToken) ? User::getByRssToken($rssToken) : User::getByEmail($email);
+            $ret = !empty($rssToken) ? User::getByRssToken($rssToken) : User::getByEmail($email);
             if ($ret === null) {
                 app('smarty.view')->assign('error', 'The email or apikey are not recognised.');
                 $sent = true;

app/Extensions/helper/helpers.php

Spacing +20 added lines, -20 removed lines

@@ -16,7 +16,7 @@ 
 use Symfony\Component\Process\Process;
 use Zip as ZipStream;
 
-if (! function_exists('getRawHtml')) {
+if (!function_exists('getRawHtml')) {
     /**
      * @param  bool  $cookie
      * @return bool|mixed|string
@@ -51,7 +51,7 @@ 
     }
 }
 
-if (! function_exists('makeFieldLinks')) {
+if (!function_exists('makeFieldLinks')) {
     /**
      * @return string
      *
@@ -81,7 +81,7 @@ 
     }
 }
 
-if (! function_exists('getUserBrowseOrder')) {
+if (!function_exists('getUserBrowseOrder')) {
     /**
      * @param  string  $orderBy
      */
@@ -107,7 +107,7 @@ 
     }
 }
 
-if (! function_exists('getUserBrowseOrdering')) {
+if (!function_exists('getUserBrowseOrdering')) {
     function getUserBrowseOrdering(): array
     {
         return [
@@ -137,21 +137,21 @@ 
     }
 }
 
-if (! function_exists('createGUID')) {
+if (!function_exists('createGUID')) {
     /**
      * @throws Exception
      */
     function createGUID(): string
     {
         $data = random_bytes(16);
-        $data[6] = \chr(\ord($data[6]) & 0x0F | 0x40);    // set version to 0100
-        $data[8] = \chr(\ord($data[8]) & 0x3F | 0x80);    // set bits 6-7 to 10
+        $data[6] = \chr(\ord($data[6]) & 0x0F|0x40); // set version to 0100
+        $data[8] = \chr(\ord($data[8]) & 0x3F|0x80); // set bits 6-7 to 10
 
         return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(sodium_bin2hex($data), 4));
     }
 }
 
-if (! function_exists('getSimilarName')) {
+if (!function_exists('getSimilarName')) {
     /**
      * @param  string  $name
      */
@@ -161,7 +161,7 @@ 
     }
 }
 
-if (! function_exists('color')) {
+if (!function_exists('color')) {
     /**
      * @param  string  $string
      */
@@ -171,7 +171,7 @@ 
     }
 }
 
-if (! function_exists('human_filesize')) {
+if (!function_exists('human_filesize')) {
     /**
      * @param  int  $decimals
      */
@@ -184,7 +184,7 @@ 
     }
 }
 
-if (! function_exists('bcdechex')) {
+if (!function_exists('bcdechex')) {
     /**
      * @return string
      */
@@ -201,7 +201,7 @@ 
     }
 }
 
-if (! function_exists('runCmd')) {
+if (!function_exists('runCmd')) {
     /**
      * Run CLI command.
      *
@@ -229,7 +229,7 @@ 
     }
 }
 
-if (! function_exists('escapeString')) {
+if (!function_exists('escapeString')) {
     /**
      * @return string
      */
@@ -239,7 +239,7 @@ 
     }
 }
 
-if (! function_exists('realDuration')) {
+if (!function_exists('realDuration')) {
     /**
      * @return string
      */
@@ -251,7 +251,7 @@ 
     }
 }
 
-if (! function_exists('is_it_json')) {
+if (!function_exists('is_it_json')) {
     /**
      * @param  array|string  $isIt
      * @return bool
@@ -294,7 +294,7 @@ 
     return $zipped;
 }
 
-if (! function_exists('release_flag')) {
+if (!function_exists('release_flag')) {
     // Function inspired by c0r3@newznabforums adds country flags on the browse page.
     /**
      * @param  string  $text  Text to match against.
@@ -430,10 +430,10 @@ 
 
         return '';
     }
-    if (! function_exists('sanitize')) {
+    if (!function_exists('sanitize')) {
         function sanitize(array|string $phrases, array $doNotSanitize = []): string
         {
-            if (! is_array($phrases)) {
+            if (!is_array($phrases)) {
                 $wordArray = explode(' ', str_replace('.', ' ', $phrases));
             } else {
                 $wordArray = $phrases;
@@ -444,9 +444,9 @@ 
             foreach ($wordArray as $words) {
                 $words = preg_split('/\s+/', $words);
                 foreach ($words as $st) {
-                    if (Str::startsWith($st, ['!', '+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/([!+?\-*]){2,}/', $st)) {
+                    if (Str::startsWith($st, ['!', '+', '-', '?', '*']) && Str::length($st) > 1 && !preg_match('/([!+?\-*]){2,}/', $st)) {
                         $str = $st;
-                    } elseif (Str::endsWith($st, ['+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/([!+?\-*]){2,}/', $st)) {
+                    } elseif (Str::endsWith($st, ['+', '-', '?', '*']) && Str::length($st) > 1 && !preg_match('/([!+?\-*]){2,}/', $st)) {
                         $str = $st;
                     } else {
                         $str = Sanitizer::escape($st, $doNotSanitize);

misc/update/update_binaries.php

Spacing +2 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 }
 $binaries = new Binaries(['NNTP' => $nntp]);
 
-if (isset($argv[1]) && ! is_numeric($argv[1])) {
+if (isset($argv[1]) && !is_numeric($argv[1])) {
     $groupName = $argv[1];
     $colorCli->header("Updating group: $groupName");
 
@@ -36,8 +36,7 @@ 
     }
 } else {
     try {
-        $binaries->updateAllGroups((isset($argv[1]) && is_numeric($argv[1]) && $argv[1] > 0 ? $argv[1] :
-            $maxHeaders));
+        $binaries->updateAllGroups((isset($argv[1]) && is_numeric($argv[1]) && $argv[1] > 0 ? $argv[1] : $maxHeaders));
     } catch (Throwable $e) {
         Illuminate\Support\Facades\Log::error($e->getMessage());
     }