NNTmux / newznab-tmux

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,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');
         });
         Event::listen(Login::class, LoginViaRemember::class);

misc/update/tmux/bin/groupfixrelnames.php

Spacing +9 added lines, -9 removed lines

@@ -15,7 +15,7 @@ 
 use Illuminate\Support\Facades\DB;
 
 $colorCli = new ColorCLI;
-if (! isset($argv[1])) {
+if (!isset($argv[1])) {
     $colorCli->error('This script is not intended to be run manually, it is called from Multiprocessing.');
     exit();
 }
@@ -87,7 +87,7 @@ 
                 if (preg_match('/[a-fA-F0-9]{32,40}/i', $release->name, $hits)) {
                     $nameFixer->matchPredbHash($hits[0], $release, true, 1, true);
                 }
-                if ($nameFixer->matched === false && ! empty($release->filehash) && preg_match('/[a-fA-F0-9]{32,40}/i', $release->filehash, $hits)) {
+                if ($nameFixer->matched === false && !empty($release->filehash) && preg_match('/[a-fA-F0-9]{32,40}/i', $release->filehash, $hits)) {
                     $colorCli->primaryOver('h');
                     $nameFixer->matchPredbHash($hits[0], $release, true, 1, true);
                 }
@@ -98,12 +98,12 @@ 
             }
             $nameFixer->reset();
 
-            if ((int) $release->proc_uid === NameFixer::PROC_UID_NONE && (! empty($release->uid) || ! empty($release->mediainfo))) {
+            if ((int) $release->proc_uid === NameFixer::PROC_UID_NONE && (!empty($release->uid) || !empty($release->mediainfo))) {
                 $colorCli->primaryOver('U');
-                if (! empty($release->uid)) {
+                if (!empty($release->uid)) {
                     $nameFixer->checkName($release, true, 'UID, ', 1, true);
                 }
-                if (empty($nameFixer->matched) && ! empty($release->mediainfo)) {
+                if (empty($nameFixer->matched) && !empty($release->mediainfo)) {
                     $nameFixer->checkName($release, true, 'Mediainfo, ', 1, true);
                 }
             }
@@ -115,7 +115,7 @@ 
             }
             $nameFixer->reset();
 
-            if ((int) $release->proc_crc32 === NameFixer::PROC_CRC_NONE && ! empty($release->crc)) {
+            if ((int) $release->proc_crc32 === NameFixer::PROC_CRC_NONE && !empty($release->crc)) {
                 $colorCli->primaryOver('C');
                 $nameFixer->checkName($release, true, 'CRC32, ', 1, true);
             }
@@ -139,7 +139,7 @@ 
             }
             $nameFixer->reset();
 
-            if ((int) $release->proc_hash16k === NameFixer::PROC_HASH16K_NONE && ! empty($release->hash)) {
+            if ((int) $release->proc_hash16k === NameFixer::PROC_HASH16K_NONE && !empty($release->hash)) {
                 $colorCli->primaryOver('H');
                 $nameFixer->checkName($release, true, 'PAR2 hash, ', 1, true);
             }
@@ -151,7 +151,7 @@ 
             }
             $nameFixer->reset();
 
-            if ((int) $release->nfostatus === Nfo::NFO_FOUND && (int) $release->proc_nfo === NameFixer::PROC_NFO_NONE && ! empty($release->textstring) && ! preg_match('/^=newz\[NZB\]=\w+/', $release->textstring)) {
+            if ((int) $release->nfostatus === Nfo::NFO_FOUND && (int) $release->proc_nfo === NameFixer::PROC_NFO_NONE && !empty($release->textstring) && !preg_match('/^=newz\[NZB\]=\w+/', $release->textstring)) {
                 $colorCli->primaryOver('n');
                 $nameFixer->done = $nameFixer->matched = false;
                 $nameFixer->checkName($release, true, 'NFO, ', 1, true);
@@ -189,7 +189,7 @@ 
 
             if ((int) $release->proc_par2 === NameFixer::PROC_PAR2_NONE) {
                 $colorCli->primaryOver('p');
-                if (! isset($nzbcontents)) {
+                if (!isset($nzbcontents)) {
                     $nntp = new NNTP;
                     $compressedHeaders = config('nntmux_nntp.compressed_headers');
                     if ((config('nntmux_nntp.use_alternate_nntp_server') === true ? $nntp->doConnect($compressedHeaders, true) : $nntp->doConnect()) !== true) {

Blacklight/NZB.php

Spacing +12 added lines, -12 removed lines

@@ -66,7 +66,7 @@ 
         $nzbSplitLevel = (int) Settings::settingValue('nzbsplitlevel');
         $this->nzbSplitLevel = $nzbSplitLevel ?? 1;
         $this->siteNzbPath = config('nntmux_settings.path_to_nzbs');
-        if (! Str::endsWith($this->siteNzbPath, '/')) {
+        if (!Str::endsWith($this->siteNzbPath, '/')) {
             $this->siteNzbPath .= '/';
         }
         $this->_nzbCommentString = sprintf(
@@ -110,7 +110,7 @@ 
         $XMLWriter->startElement('head');
         $XMLWriter->startElement('meta');
         $XMLWriter->writeAttribute('type', 'category');
-        $XMLWriter->text(! empty($release->category->parent) ? $release->category->parent->title.' >'.$release->category->title : 'Other > Misc');
+        $XMLWriter->text(!empty($release->category->parent) ? $release->category->parent->title.' >'.$release->category->title : 'Other > Misc');
         $XMLWriter->endElement();
         $XMLWriter->startElement('meta');
         $XMLWriter->writeAttribute('type', 'name');
@@ -172,20 +172,20 @@ 
         $XMLWriter->endDocument();
         $path = ($this->buildNZBPath($release->guid, $this->nzbSplitLevel, true).$release->guid.'.nzb.gz');
         $fp = gzopen($path, 'wb7');
-        if (! $fp) {
+        if (!$fp) {
             return false;
         }
         gzwrite($fp, $XMLWriter->outputMemory());
         gzclose($fp);
         unset($XMLWriter);
-        if (! File::isFile($path)) {
+        if (!File::isFile($path)) {
             echo "ERROR: $path does not exist.\n";
 
             return false;
         }
         // Mark release as having NZB.
         $release->update(['nzbstatus' => self::NZB_ADDED]);
-        if (! empty($nzb_guid)) {
+        if (!empty($nzb_guid)) {
             $release->update(['nzb_guid' => DB::raw('UNHEX( '.escapeString(md5($nzb_guid)).' )')]);
         }
 
@@ -216,7 +216,7 @@ 
 
         $nzbPath = $this->siteNzbPath.$nzbPath;
 
-        if ($createIfNotExist && ! File::isDirectory($nzbPath) && ! File::makeDirectory($nzbPath, 0777, true) && ! File::isDirectory($nzbPath)) {
+        if ($createIfNotExist && !File::isDirectory($nzbPath) && !File::makeDirectory($nzbPath, 0777, true) && !File::isDirectory($nzbPath)) {
             throw new \RuntimeException(sprintf('Directory "%s" was not created', $nzbPath));
         }
 
@@ -272,12 +272,12 @@ 
         $i = 0;
         $result = [];
 
-        if (! $nzb) {
+        if (!$nzb) {
             return $result;
         }
 
         $xml = @simplexml_load_string(str_replace("\x0F", '', $nzb));
-        if (! $xml || strtolower($xml->getName()) !== 'nzb') {
+        if (!$xml || strtolower($xml->getName()) !== 'nzb') {
             return $result;
         }
 
@@ -291,9 +291,9 @@ 
                     // Strip file / part count to get proper sorting.
                     $i = preg_replace('#\d+[- ._]?(/|\||[o0]f)[- ._]?\d+?(?![- ._]\d)#i', '', $i);
                     // Change .rar and .par2 to be sorted before .part0x.rar and .volxxx+xxx.par2
-                    if (str_contains($i, '.par2') && ! preg_match('#\.vol\d+\+\d+\.par2#i', $i)) {
+                    if (str_contains($i, '.par2') && !preg_match('#\.vol\d+\+\d+\.par2#i', $i)) {
                         $i = str_replace('.par2', '.vol0.par2', $i);
-                    } elseif (preg_match('#\.rar[^a-z0-9]#i', $i) && ! preg_match('#\.part\d+\.rar$#i', $i)) {
+                    } elseif (preg_match('#\.rar[^a-z0-9]#i', $i) && !preg_match('#\.part\d+\.rar$#i', $i)) {
                         $i = preg_replace('#\.rar(?:[^a-z0-9])#i', '.part0.rar', $i);
                     }
                 }
@@ -326,7 +326,7 @@ 
             $fileSize = $numSegments = 0;
 
             // Parts.
-            if (! isset($result[$i]['segments'])) {
+            if (!isset($result[$i]['segments'])) {
                 $result[$i]['segments'] = [];
             }
 
@@ -345,7 +345,7 @@ 
             $result[$i]['partsactual'] = $numSegments;
 
             // Groups.
-            if (! isset($result[$i]['groups'])) {
+            if (!isset($result[$i]['groups'])) {
                 $result[$i]['groups'] = [];
             }
             foreach ($file->groups->group as $g) {

Blacklight/processing/ProcessReleases.php

Spacing +34 added lines, -34 removed lines

@@ -109,7 +109,7 @@ 
         $this->echoCLI = config('nntmux.echocli');
         $groupID = '';
 
-        if (! empty($groupName)) {
+        if (!empty($groupName)) {
             $groupInfo = UsenetGroup::getByName($groupName);
             if ($groupInfo !== null) {
                 $groupID = $groupInfo['id'];
@@ -120,7 +120,7 @@ 
             $this->colorCLI->header('Starting release update process ('.now()->format('Y-m-d H:i:s').')');
         }
 
-        if (! file_exists(config('nntmux_settings.path_to_nzbs'))) {
+        if (!file_exists(config('nntmux_settings.path_to_nzbs'))) {
             if ($this->echoCLI) {
                 $this->colorCLI->error('Bad or missing nzb directory - '.config('nntmux_settings.path_to_nzbs'));
             }
@@ -181,7 +181,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();
@@ -217,7 +217,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);
@@ -230,7 +230,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');
@@ -257,7 +257,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(
                     '
@@ -273,7 +273,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) {
@@ -312,16 +312,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,
@@ -393,7 +393,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'])
@@ -448,7 +448,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(),
@@ -464,7 +464,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);
 
@@ -525,7 +525,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);
 
@@ -566,7 +566,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();
@@ -669,7 +669,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')))
@@ -832,7 +832,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);
@@ -891,7 +891,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'])
@@ -977,18 +977,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);
@@ -1009,25 +1009,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]);
@@ -1045,7 +1045,7 @@ 
      */
     private function collectionFileCheckStage3(string $where): void
     {
-        DB::transaction(static function () use ($where) {
+        DB::transaction(static function() use ($where) {
             DB::update(
                 sprintf(
                     '
@@ -1069,7 +1069,7 @@ 
             );
         }, 10);
 
-        DB::transaction(static function () use ($where) {
+        DB::transaction(static function() use ($where) {
             DB::update(
                 sprintf(
                     '
@@ -1106,7 +1106,7 @@ 
      */
     private function collectionFileCheckStage4(string &$where): void
     {
-        DB::transaction(static function () use ($where) {
+        DB::transaction(static function() use ($where) {
             DB::update(
                 sprintf(
                     '
@@ -1136,9 +1136,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]);
@@ -1156,7 +1156,7 @@ 
      */
     private function collectionFileCheckStage6(string &$where): void
     {
-        DB::transaction(function () use ($where) {
+        DB::transaction(function() use ($where) {
             DB::update(
                 sprintf(
                     "
@@ -1186,10 +1186,10 @@ 
     {
         $lastRun = Settings::settingValue('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();

Blacklight/NNTP.php

Spacing +27 added lines, -27 removed lines

@@ -151,7 +151,7 @@ 
         ];
         $primaryConnections = $this->_tmux->getUSPConnections('primary', $primaryUSP);
         $alternateConnections = $this->_tmux->getUSPConnections('alternate', $alternateUSP);
-        if ($this->_isConnected() && (($alternate && $this->_currentServer === config('nntmux_nntp.alternate_server') && ($this->_primaryNntpConnections < $alternateConnections['alternate']['active'])) || (! $alternate && $this->_currentServer === config('nntmux_nntp.server') && ($this->_primaryNntpConnections < $primaryConnections['primary']['active'])))) {
+        if ($this->_isConnected() && (($alternate && $this->_currentServer === config('nntmux_nntp.alternate_server') && ($this->_primaryNntpConnections < $alternateConnections['alternate']['active'])) || (!$alternate && $this->_currentServer === config('nntmux_nntp.server') && ($this->_primaryNntpConnections < $primaryConnections['primary']['active'])))) {
             return true;
         }
 
@@ -160,20 +160,20 @@ 
         $ret = $connected = $cError = $aError = false;
 
         // Set variables to connect based on if we are using the alternate provider or not.
-        if (! $alternate) {
+        if (!$alternate) {
             $sslEnabled = (bool) config('nntmux_nntp.ssl');
             $this->_currentServer = config('nntmux_nntp.server');
             $this->_currentPort = config('nntmux_nntp.port');
             $userName = config('nntmux_nntp.username');
             $password = config('nntmux_nntp.password');
-            $socketTimeout = ! empty(config('nntmux_nntp.socket_timeout')) ? config('nntmux_nntp.socket_timeout') : $this->_socketTimeout;
+            $socketTimeout = !empty(config('nntmux_nntp.socket_timeout')) ? config('nntmux_nntp.socket_timeout') : $this->_socketTimeout;
         } else {
             $sslEnabled = (bool) config('nntmux_nntp.alternate_server_ssl');
             $this->_currentServer = config('nntmux_nntp.alternate_server');
             $this->_currentPort = config('nntmux_nntp.alternate_server_port');
             $userName = config('nntmux_nntp.alternate_server_username');
             $password = config('nntmux_nntp.alternate_server_password');
-            $socketTimeout = ! empty(config('nntmux_nntp.alternate_server_socket_timeout')) ? config('nntmux_nntp.alternate_server_socket_timeout') : $this->_socketTimeout;
+            $socketTimeout = !empty(config('nntmux_nntp.alternate_server_socket_timeout')) ? config('nntmux_nntp.alternate_server_socket_timeout') : $this->_socketTimeout;
         }
 
         $enc = ($sslEnabled ? ' (ssl)' : ' (non-ssl)');
@@ -186,19 +186,19 @@ 
             $authenticated = false;
 
             // If we are not connected, try to connect.
-            if (! $connected) {
+            if (!$connected) {
                 $ret = $this->connect($this->_currentServer, $sslEnabled, $this->_currentPort, 5, $socketTimeout);
             }
             // Check if we got an error while connecting.
             $cErr = self::isError($ret);
 
             // If no error, we are connected.
-            if (! $cErr) {
+            if (!$cErr) {
                 // Say that we are connected so we don't retry.
                 $connected = true;
                 // When there is no error it returns bool if we are allowed to post or not.
                 $this->_postingAllowed = $ret;
-            } elseif (! $cError) {
+            } elseif (!$cError) {
                 $cError = $ret->getMessage();
             }
 
@@ -208,7 +208,7 @@ 
             }
 
             // If we have no more retries and could not connect, return an error.
-            if ($retries === 0 && ! $connected) {
+            if ($retries === 0 && !$connected) {
                 $message =
                     'Cannot connect to server '.
                     $this->_currentServer.
@@ -233,9 +233,9 @@ 
                     $aErr = self::isError($ret2);
 
                     // If there was no error, then we are authenticated.
-                    if (! $aErr) {
+                    if (!$aErr) {
                         $authenticated = true;
-                    } elseif (! $aError) {
+                    } elseif (!$aError) {
                         $aError = $ret2->getMessage();
                     }
 
@@ -245,7 +245,7 @@ 
                     }
 
                     // If we ran out of retries, return an error.
-                    if ($retries === 0 && ! $authenticated) {
+                    if ($retries === 0 && !$authenticated) {
                         $message =
                             'Cannot authenticate to server '.
                             $this->_currentServer.
@@ -261,7 +261,7 @@ 
             // If we are connected and authenticated, try enabling compression if we have it enabled.
             if ($connected && $authenticated) {
                 // Check if we should use compression on the connection.
-                if (! $compression || config('nntmux_nntp.compressed_headers') === false) {
+                if (!$compression || config('nntmux_nntp.compressed_headers') === false) {
                     $this->_compressionSupported = false;
                 }
 
@@ -544,7 +544,7 @@ 
                 $message = $this->_getMessage($groupName, $wanted);
 
                 // Append the body to $body.
-                if (! self::isError($message)) {
+                if (!self::isError($message)) {
                     $body .= $message;
 
                     if ($messageSize === 0) {
@@ -553,7 +553,7 @@ 
 
                     // If there is an error try the alternate provider or return the PEAR error.
                 } elseif ($alternate) {
-                    if (! $aConnected) {
+                    if (!$aConnected) {
                         $compressedHeaders = config('nntmux_nntp.compressed_headers');
                         // Check if the current connected server is the alternate or not.
                         $aConnected = $this->_currentServer === config('nntmux_nntp.server') ? $nntp->doConnect($compressedHeaders, true) : $nntp->doConnect();
@@ -642,7 +642,7 @@ 
         }
 
         // Check if it's an article number or message-ID.
-        if (! is_numeric($identifier)) {
+        if (!is_numeric($identifier)) {
             // If it's a message-ID, check if it has the required triangular brackets.
             $identifier = $this->_formatMessageID($identifier);
         }
@@ -662,7 +662,7 @@ 
             $emptyLine = false;
             foreach ($article as $line) {
                 // If we found the empty line it means we are done reading the header and we will start reading the body.
-                if (! $emptyLine) {
+                if (!$emptyLine) {
                     if ($line === '') {
                         $emptyLine = true;
 
@@ -720,7 +720,7 @@ 
         }
 
         // Check if it's an article number or message-id.
-        if (! is_numeric($identifier)) {
+        if (!is_numeric($identifier)) {
             // Verify we have the required triangular brackets if it is a message-id.
             $identifier = $this->_formatMessageID($identifier);
         }
@@ -770,7 +770,7 @@ 
      */
     public function postArticle(array|string $groups, string $subject, \Exception|string $body, string $from, bool $yEnc = true, bool $compress = true, string $extra = ''): mixed
     {
-        if (! $this->_postingAllowed) {
+        if (!$this->_postingAllowed) {
             $message = 'You do not have the right to post articles on server '.$this->_currentServer;
 
             return $this->throwError($this->colorCli->climate()->error($message));
@@ -904,7 +904,7 @@ 
         if ($this->_compressionEnabled) {
             return true;
         }
-        if (! $this->_compressionSupported) {
+        if (!$this->_compressionSupported) {
             return false;
         }
 
@@ -918,7 +918,7 @@ 
             return $response;
         }
         if ($response !== 290) {
-            if (! $secondTry) {
+            if (!$secondTry) {
                 // Retry.
                 $this->cmdQuit();
                 if ($this->_checkConnection()) {
@@ -976,7 +976,7 @@ 
         $possibleTerm = false;
         $data = null;
 
-        while (! feof($this->_socket)) {
+        while (!feof($this->_socket)) {
             // Did we find a possible ending ? (.\r\n)
             if ($possibleTerm) {
                 // Loop, sleeping shortly, to allow the server time to upload data, if it has any.
@@ -991,7 +991,7 @@ 
                     stream_set_blocking($this->_socket, 1);
 
                     // Don't sleep on last iteration.
-                    if (! empty($buffer)) {
+                    if (!empty($buffer)) {
                         break;
                     }
                     if ($i < 2) {
@@ -1004,7 +1004,7 @@ 
                     // Remove .\r\n from end, decompress data.
                     $deComp = @gzuncompress(mb_substr($data, 0, -3, '8bit'));
 
-                    if (! empty($deComp)) {
+                    if (!empty($deComp)) {
                         $bytesReceived = \strlen($data);
                         if ($this->_echo && $bytesReceived > 10240) {
                             $this->colorCli->climate()->primaryOver(
@@ -1076,7 +1076,7 @@ 
         }
 
         // Check if the last char is >, if not add it.
-        if (! str_ends_with($messageID, '>')) {
+        if (!str_ends_with($messageID, '>')) {
             $messageID .= '>';
         }
 
@@ -1103,7 +1103,7 @@ 
         }
 
         // Check if this is an article number or message-id.
-        if (! is_numeric($identifier)) {
+        if (!is_numeric($identifier)) {
             // It's a message-id so check if it has the triangular brackets.
             $identifier = $this->_formatMessageID($identifier);
         }
@@ -1117,7 +1117,7 @@ 
         $body = '';
         if ($response === NET_NNTP_PROTOCOL_RESPONSECODE_BODY_FOLLOWS) {
             // Continue until connection is lost
-            while (! feof($this->_socket)) {
+            while (!feof($this->_socket)) {
                 // Retrieve and append up to 1024 characters from the server.
                 $line = fgets($this->_socket, 1024);
 
@@ -1367,6 +1367,6 @@ 
      */
     public function _isConnected(bool $feOf = true): bool
     {
-        return is_resource($this->_socket) && (! $feOf || ! feof($this->_socket));
+        return is_resource($this->_socket) && (!$feOf || !feof($this->_socket));
     }
 }

app/Http/Controllers/Auth/RegisterController.php

Spacing +3 added lines, -3 removed lines

@@ -147,7 +147,7 @@ 
                 // Get the default user role.
                 $userDefault = Role::query()->where('isdefault', '=', 1)->first();
 
-                if (! empty($error)) {
+                if (!empty($error)) {
                     return $this->showRegistrationForm($request, $error);
                 }
 
@@ -170,7 +170,7 @@ 
                 break;
             case 'view':
                 // See if it is a valid invite.
-                if (($inviteCode !== null) && ! Invite::isValid($inviteCode)) {
+                if (($inviteCode !== null) && !Invite::isValid($inviteCode)) {
                     $error = 'Invalid invitation token!';
                     $showRegister = 0;
                 } else {
@@ -202,7 +202,7 @@ 
         }
 
         if ((int) Settings::settingValue('registerstatus') === Settings::REGISTER_STATUS_INVITE) {
-            if (! empty($inviteCode)) {
+            if (!empty($inviteCode)) {
                 if (Invite::isValid($inviteCode)) {
                     $error = '';
                     $showRegister = 1;

app/Http/Controllers/Admin/AdminSiteController.php

Spacing +3 added lines, -3 removed lines

@@ -149,7 +149,7 @@ 
         }
 
         // convert from a string array to an int array as we want to use int
-        $book_reqids_ids = array_map(function ($value) {
+        $book_reqids_ids = array_map(function($value) {
             return (int) $value;
         }, $book_reqids_ids);
         $this->smarty->assign('book_reqids_ids', $book_reqids_ids);
@@ -159,14 +159,14 @@ 
         $books_selected = explode(',', Settings::settingValue('book_reqids'));
 
         // convert from a string array to an int array
-        $books_selected = array_map(function ($value) {
+        $books_selected = array_map(function($value) {
             return (int) $value;
         }, $books_selected);
         $this->smarty->assign('book_reqids_selected', $books_selected);
 
         $this->smarty->assign('themelist', Utility::getThemesList());
 
-        if (! str_contains(config('settings.nntp_server'), 'astra')) {
+        if (!str_contains(config('settings.nntp_server'), 'astra')) {
             $this->smarty->assign('compress_headers_warning', 'compress_headers_warning');
         }
 

app/Http/Controllers/ProfileController.php

Spacing +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
         $privateProfiles = config('nntmux_settings.private_profiles');
         $publicView = false;
 
-        if ($privileged || ! $privateProfiles) {
+        if ($privileged || !$privateProfiles) {
             $altID = ($request->has('id') && (int) $request->input('id') >= 0) ? (int) $request->input('id') : false;
             $altUsername = ($request->has('name') && $request->input('name') !== '') ? $request->input('name') : false;
 
@@ -61,7 +61,7 @@ 
         }
 
         // Check if the user selected a theme.
-        if (! isset($this->userdata->style) || $this->userdata->style === 'None') {
+        if (!isset($this->userdata->style) || $this->userdata->style === 'None') {
             $this->userdata->style = 'Using the admin selected theme.';
         }
         $this->smarty->assign(
@@ -112,7 +112,7 @@ 
         $action = $request->input('action') ?? 'view';
 
         $userid = $this->userdata->id;
-        if (! $this->userdata) {
+        if (!$this->userdata) {
             $this->show404('No such user!');
         }
 
@@ -151,7 +151,7 @@ 
                         'None',
                     );
 
-                    if ((int) $request->input('viewconsole') === 1 && $this->userdata->can('view console') && ! $this->userdata->hasDirectPermission('view console')) {
+                    if ((int) $request->input('viewconsole') === 1 && $this->userdata->can('view console') && !$this->userdata->hasDirectPermission('view console')) {
                         $this->userdata->givePermissionTo('view console');
                     } elseif ((int) $request->input('viewconsole') === 0 && $this->userdata->can('view console') && $this->userdata->hasDirectPermission('view console')) {
                         $this->userdata->revokePermissionTo('view console');
@@ -159,7 +159,7 @@ 
                         $this->userdata->revokePermissionTo('view console');
                     }
 
-                    if ((int) $request->input('viewmovies') === 1 && $this->userdata->can('view movies') && ! $this->userdata->hasDirectPermission('view movies')) {
+                    if ((int) $request->input('viewmovies') === 1 && $this->userdata->can('view movies') && !$this->userdata->hasDirectPermission('view movies')) {
                         $this->userdata->givePermissionTo('view movies');
                     } elseif ((int) $request->input('viewmovies') === 0 && $this->userdata->can('view movies') && $this->userdata->hasDirectPermission('view movies')) {
                         $this->userdata->revokePermissionTo('view movies');
@@ -167,7 +167,7 @@ 
                         $this->userdata->revokePermissionTo('view movies');
                     }
 
-                    if ((int) $request->input('viewaudio') === 1 && $this->userdata->can('view audio') && ! $this->userdata->hasDirectPermission('view audio')) {
+                    if ((int) $request->input('viewaudio') === 1 && $this->userdata->can('view audio') && !$this->userdata->hasDirectPermission('view audio')) {
                         $this->userdata->givePermissionTo('view audio');
                     } elseif ((int) $request->input('viewaudio') === 0 && $this->userdata->can('view audio') && $this->userdata->hasDirectPermission('view audio')) {
                         $this->userdata->revokePermissionTo('view audio');
@@ -175,7 +175,7 @@ 
                         $this->userdata->revokePermissionTo('view audio');
                     }
 
-                    if ((int) $request->input('viewpc') === 1 && $this->userdata->can('view pc') && ! $this->userdata->hasDirectPermission('view pc')) {
+                    if ((int) $request->input('viewpc') === 1 && $this->userdata->can('view pc') && !$this->userdata->hasDirectPermission('view pc')) {
                         $this->userdata->givePermissionTo('view pc');
                     } elseif ((int) $request->input('viewpc') === 0 && $this->userdata->can('view pc') && $this->userdata->hasDirectPermission('view pc')) {
                         $this->userdata->revokePermissionTo('view pc');
@@ -183,7 +183,7 @@ 
                         $this->userdata->revokePermissionTo('view pc');
                     }
 
-                    if ((int) $request->input('viewtv') === 1 && $this->userdata->can('view tv') && ! $this->userdata->hasDirectPermission('view tv')) {
+                    if ((int) $request->input('viewtv') === 1 && $this->userdata->can('view tv') && !$this->userdata->hasDirectPermission('view tv')) {
                         $this->userdata->givePermissionTo('view tv');
                     } elseif ((int) $request->input('viewtv') === 0 && $this->userdata->can('view tv') && $this->userdata->hasDirectPermission('view tv')) {
                         $this->userdata->revokePermissionTo('view tv');
@@ -191,7 +191,7 @@ 
                         $this->userdata->revokePermissionTo('view tv');
                     }
 
-                    if ((int) $request->input('viewadult') === 1 && $this->userdata->can('view adult') && ! $this->userdata->hasDirectPermission('view adult')) {
+                    if ((int) $request->input('viewadult') === 1 && $this->userdata->can('view adult') && !$this->userdata->hasDirectPermission('view adult')) {
                         $this->userdata->givePermissionTo('view adult');
                     } elseif ((int) $request->input('viewadult') === 0 && $this->userdata->can('view adult') && $this->userdata->hasDirectPermission('view adult')) {
                         $this->userdata->revokePermissionTo('view adult');
@@ -199,7 +199,7 @@ 
                         $this->userdata->revokePermissionTo('view adult');
                     }
 
-                    if ((int) $request->input('viewbooks') === 1 && $this->userdata->can('view books') && ! $this->userdata->hasDirectPermission('view books')) {
+                    if ((int) $request->input('viewbooks') === 1 && $this->userdata->can('view books') && !$this->userdata->hasDirectPermission('view books')) {
                         $this->userdata->givePermissionTo('view books');
                     } elseif ((int) $request->input('viewbooks') === 0 && $this->userdata->can('view books') && $this->userdata->hasDirectPermission('view books')) {
                         $this->userdata->revokePermissionTo('view books');
@@ -207,7 +207,7 @@ 
                         $this->userdata->revokePermissionTo('view books');
                     }
 
-                    if ((int) $request->input('viewother') === 1 && $this->userdata->can('view other') && ! $this->userdata->hasDirectPermission('view other')) {
+                    if ((int) $request->input('viewother') === 1 && $this->userdata->can('view other') && !$this->userdata->hasDirectPermission('view other')) {
                         $this->userdata->givePermissionTo('view other');
                     } elseif ((int) $request->input('viewother') === 0 && $this->userdata->can('view other') && $this->userdata->hasDirectPermission('view other')) {
                         $this->userdata->revokePermissionTo('view other');
@@ -215,12 +215,12 @@ 
                         $this->userdata->revokePermissionTo('view other');
                     }
 
-                    if ($request->has('password') && ! empty($request->input('password'))) {
+                    if ($request->has('password') && !empty($request->input('password'))) {
                         User::updatePassword($userid, $request->input('password'));
                     }
 
-                    if (! $this->userdata->hasRole('Admin')) {
-                        if (! empty($request->input('email')) && $this->userdata->email !== $request->input('email')) {
+                    if (!$this->userdata->hasRole('Admin')) {
+                        if (!empty($request->input('email')) && $this->userdata->email !== $request->input('email')) {
                             $this->userdata->email = $request->input('email');
 
                             $verify_user = $this->userdata;
@@ -269,7 +269,7 @@ 
         $this->setPreferences();
         $userId = $request->input('id');
 
-        if ($userId !== null && (int) $userId === $this->userdata->id && ! $this->userdata->hasRole('Admin')) {
+        if ($userId !== null && (int) $userId === $this->userdata->id && !$this->userdata->hasRole('Admin')) {
             $user = User::find($userId);
             SendAccountDeletedEmail::dispatch($user);
             Auth::logout();

app/Models/User.php

Spacing +14 added lines, -14 removed lines

@@ -254,7 +254,7 @@ 
     {
         $res = self::query()->where('email', '<>', 'sharing@nZEDb.com');
 
-        if (! empty($role)) {
+        if (!empty($role)) {
             $res->where('roles_id', $role);
         }
 
@@ -295,7 +295,7 @@ 
             'rate_limit' => $rateLimit ? $rateLimit['rate_limit'] : 60,
         ];
 
-        if (! empty($email)) {
+        if (!empty($email)) {
             $email = trim($email);
             $sql += ['email' => $email];
         }
@@ -344,10 +344,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)]);
         }
     }
@@ -404,10 +404,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))
@@ -519,7 +519,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;
     }
 
     /**
@@ -555,7 +555,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;
             }
@@ -575,7 +575,7 @@ 
     public static function checkAndUseInvite(string $inviteCode): int
     {
         $invite = Invitation::getInvite($inviteCode);
-        if (! $invite) {
+        if (!$invite) {
             return -1;
         }
 
@@ -591,7 +591,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;
         }
 
@@ -633,9 +633,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,