NNTmux / newznab-tmux

Blacklight/IRCScraper.php

Spacing +36 added lines, -36 removed lines

@@ -173,7 +173,7 @@ 
         $channels = config('irc_settings.scrape_irc_channels') ? unserialize(config('irc_settings.scrape_irc_channels'), ['allowed_classes' => ['#PreNNTmux', '#nZEDbPRE']]) : ['#PreNNTmux' => null];
         $this->joinChannels($channels);
 
-        if (! $this->_silent) {
+        if (!$this->_silent) {
             echo '['.
                 date('r').
                 '] [Scraping of IRC channels for ('.
@@ -291,34 +291,34 @@ 
         } else {
             $indexData = $this->manticoreSearch->searchIndexes('predb_rt', $this->_curPre['title'], ['title']);
         }
-        if (! empty($indexData) || empty($this->_curPre['title'])) {
+        if (!empty($indexData) || empty($this->_curPre['title'])) {
             return;
         }
 
         $query = 'INSERT INTO predb (';
 
-        $query .= (! empty($this->_curPre['size']) ? 'size, ' : '');
-        $query .= (! empty($this->_curPre['category']) ? 'category, ' : '');
-        $query .= (! empty($this->_curPre['source']) ? 'source, ' : '');
-        $query .= (! empty($this->_curPre['reason']) ? 'nukereason, ' : '');
-        $query .= (! empty($this->_curPre['files']) ? 'files, ' : '');
-        $query .= (! empty($this->_curPre['reqid']) ? 'requestid, ' : '');
-        $query .= (! empty($this->_curPre['group_id']) ? 'groups_id, ' : '');
-        $query .= (! empty($this->_curPre['nuked']) ? 'nuked, ' : '');
-        $query .= (! empty($this->_curPre['filename']) ? 'filename, ' : '');
+        $query .= (!empty($this->_curPre['size']) ? 'size, ' : '');
+        $query .= (!empty($this->_curPre['category']) ? 'category, ' : '');
+        $query .= (!empty($this->_curPre['source']) ? 'source, ' : '');
+        $query .= (!empty($this->_curPre['reason']) ? 'nukereason, ' : '');
+        $query .= (!empty($this->_curPre['files']) ? 'files, ' : '');
+        $query .= (!empty($this->_curPre['reqid']) ? 'requestid, ' : '');
+        $query .= (!empty($this->_curPre['group_id']) ? 'groups_id, ' : '');
+        $query .= (!empty($this->_curPre['nuked']) ? 'nuked, ' : '');
+        $query .= (!empty($this->_curPre['filename']) ? 'filename, ' : '');
 
         $query .= 'predate, title) VALUES (';
 
-        $query .= (! empty($this->_curPre['size']) ? escapeString($this->_curPre['size']).', ' : '');
-        $query .= (! empty($this->_curPre['category']) ? escapeString($this->_curPre['category']).', ' : '');
-        $query .= (! empty($this->_curPre['source']) ? escapeString($this->_curPre['source']).', ' : '');
-        $query .= (! empty($this->_curPre['reason']) ? escapeString($this->_curPre['reason']).', ' : '');
-        $query .= (! empty($this->_curPre['files']) ? escapeString($this->_curPre['files']).', ' : '');
-        $query .= (! empty($this->_curPre['reqid']) ? $this->_curPre['reqid'].', ' : '');
-        $query .= (! empty($this->_curPre['group_id']) ? $this->_curPre['group_id'].', ' : '');
-        $query .= (! empty($this->_curPre['nuked']) ? $this->_curPre['nuked'].', ' : '');
-        $query .= (! empty($this->_curPre['filename']) ? escapeString($this->_curPre['filename']).', ' : '');
-        $query .= (! empty($this->_curPre['predate']) ? $this->_curPre['predate'].', ' : 'NOW(), ');
+        $query .= (!empty($this->_curPre['size']) ? escapeString($this->_curPre['size']).', ' : '');
+        $query .= (!empty($this->_curPre['category']) ? escapeString($this->_curPre['category']).', ' : '');
+        $query .= (!empty($this->_curPre['source']) ? escapeString($this->_curPre['source']).', ' : '');
+        $query .= (!empty($this->_curPre['reason']) ? escapeString($this->_curPre['reason']).', ' : '');
+        $query .= (!empty($this->_curPre['files']) ? escapeString($this->_curPre['files']).', ' : '');
+        $query .= (!empty($this->_curPre['reqid']) ? $this->_curPre['reqid'].', ' : '');
+        $query .= (!empty($this->_curPre['group_id']) ? $this->_curPre['group_id'].', ' : '');
+        $query .= (!empty($this->_curPre['nuked']) ? $this->_curPre['nuked'].', ' : '');
+        $query .= (!empty($this->_curPre['filename']) ? escapeString($this->_curPre['filename']).', ' : '');
+        $query .= (!empty($this->_curPre['predate']) ? $this->_curPre['predate'].', ' : 'NOW(), ');
 
         $query .= '%s)';
 
@@ -359,17 +359,17 @@ 
 
         $query = 'UPDATE predb SET ';
 
-        $query .= (! empty($this->_curPre['size']) ? 'size = '.escapeString($this->_curPre['size']).', ' : '');
-        $query .= (! empty($this->_curPre['source']) ? 'source = '.escapeString($this->_curPre['source']).', ' : '');
-        $query .= (! empty($this->_curPre['files']) ? 'files = '.escapeString($this->_curPre['files']).', ' : '');
-        $query .= (! empty($this->_curPre['reason']) ? 'nukereason = '.escapeString($this->_curPre['reason']).', ' : '');
-        $query .= (! empty($this->_curPre['reqid']) ? 'requestid = '.$this->_curPre['reqid'].', ' : '');
-        $query .= (! empty($this->_curPre['group_id']) ? 'groups_id = '.$this->_curPre['group_id'].', ' : '');
-        $query .= (! empty($this->_curPre['predate']) ? 'predate = '.$this->_curPre['predate'].', ' : '');
-        $query .= (! empty($this->_curPre['nuked']) ? 'nuked = '.$this->_curPre['nuked'].', ' : '');
-        $query .= (! empty($this->_curPre['filename']) ? 'filename = '.escapeString($this->_curPre['filename']).', ' : '');
+        $query .= (!empty($this->_curPre['size']) ? 'size = '.escapeString($this->_curPre['size']).', ' : '');
+        $query .= (!empty($this->_curPre['source']) ? 'source = '.escapeString($this->_curPre['source']).', ' : '');
+        $query .= (!empty($this->_curPre['files']) ? 'files = '.escapeString($this->_curPre['files']).', ' : '');
+        $query .= (!empty($this->_curPre['reason']) ? 'nukereason = '.escapeString($this->_curPre['reason']).', ' : '');
+        $query .= (!empty($this->_curPre['reqid']) ? 'requestid = '.$this->_curPre['reqid'].', ' : '');
+        $query .= (!empty($this->_curPre['group_id']) ? 'groups_id = '.$this->_curPre['group_id'].', ' : '');
+        $query .= (!empty($this->_curPre['predate']) ? 'predate = '.$this->_curPre['predate'].', ' : '');
+        $query .= (!empty($this->_curPre['nuked']) ? 'nuked = '.$this->_curPre['nuked'].', ' : '');
+        $query .= (!empty($this->_curPre['filename']) ? 'filename = '.escapeString($this->_curPre['filename']).', ' : '');
         $query .= (
-            (empty($this->_oldPre['category']) && ! empty($this->_curPre['category']))
+            (empty($this->_oldPre['category']) && !empty($this->_curPre['category']))
                 ? 'category = '.escapeString($this->_curPre['category']).', '
                 : ''
         );
@@ -404,7 +404,7 @@ 
      */
     protected function _doEcho(bool $new = true): void
     {
-        if (! $this->_silent) {
+        if (!$this->_silent) {
             $nukeString = '';
             if ($this->_nuked !== false) {
                 switch ((int) $this->_curPre['nuked']) {
@@ -439,15 +439,15 @@ 
                 $this->_curPre['title'].
                 ']'.
                 (
-                    ! empty($this->_curPre['category'])
+                    !empty($this->_curPre['category'])
                     ? ' ['.$this->_curPre['category'].']'
                     : (
-                        ! empty($this->_oldPre['category'])
+                        !empty($this->_oldPre['category'])
                         ? ' ['.$this->_oldPre['category'].']'
                         : ''
                     )
                 ).
-                (! empty($this->_curPre['size']) ? ' ['.$this->_curPre['size'].']' : '').
+                (!empty($this->_curPre['size']) ? ' ['.$this->_curPre['size'].']' : '').
                 PHP_EOL;
         }
     }
@@ -457,7 +457,7 @@ 
      */
     protected function _getGroupID(string $groupName): mixed
     {
-        if (! isset($this->_groupList[$groupName])) {
+        if (!isset($this->_groupList[$groupName])) {
             $group = UsenetGroup::query()->where('name', $groupName)->first(['id']);
             $this->_groupList[$groupName] = $group !== null ? $group['id'] : '';
         }

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 || (int) Settings::settingValue('..compressedheaders') === 0) {
+                if (!$compression || (int) Settings::settingValue('..compressedheaders') === 0) {
                     $this->_compressionSupported = false;
                 }
 
@@ -543,7 +543,7 @@ 
                 $message = $this->_getMessage($groupName, $wanted);
 
                 // Append the body to $body.
-                if (! self::isError($message)) {
+                if (!self::isError($message)) {
                     $body .= $message;
 
                     if ($messageSize === 0) {
@@ -552,7 +552,7 @@ 
 
                     // If there is an error try the alternate provider or return the PEAR error.
                 } elseif ($alternate) {
-                    if (! $aConnected) {
+                    if (!$aConnected) {
                         // Check if the current connected server is the alternate or not.
                         $aConnected = $this->_currentServer === config('nntmux_nntp.server') ? $nntp->doConnect(true, true) : $nntp->doConnect();
                     }
@@ -638,7 +638,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);
         }
@@ -658,7 +658,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;
 
@@ -716,7 +716,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);
         }
@@ -766,7 +766,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));
@@ -900,7 +900,7 @@ 
         if ($this->_compressionEnabled) {
             return true;
         }
-        if (! $this->_compressionSupported) {
+        if (!$this->_compressionSupported) {
             return false;
         }
 
@@ -914,7 +914,7 @@ 
             return $response;
         }
         if ($response !== 290) {
-            if (! $secondTry) {
+            if (!$secondTry) {
                 // Retry.
                 $this->cmdQuit();
                 if ($this->_checkConnection()) {
@@ -972,7 +972,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.
@@ -987,7 +987,7 @@ 
                     stream_set_blocking($this->_socket, 1);
 
                     // Don't sleep on last iteration.
-                    if (! empty($buffer)) {
+                    if (!empty($buffer)) {
                         break;
                     }
                     if ($i < 2) {
@@ -1000,7 +1000,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(
@@ -1072,7 +1072,7 @@ 
         }
 
         // Check if the last char is >, if not add it.
-        if (! str_ends_with($messageID, '>')) {
+        if (!str_ends_with($messageID, '>')) {
             $messageID .= '>';
         }
 
@@ -1099,7 +1099,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);
         }
@@ -1113,7 +1113,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);
 
@@ -1363,6 +1363,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));
     }
 }

Blacklight/ElasticSearchSiteSearch.php

Spacing +2 added lines, -2 removed lines

@@ -276,8 +276,8 @@
 
             // Execute a Scroll request and repeat
             $results = \Elasticsearch::scroll([
-                'scroll_id' => $scroll_id,  //...using our previously obtained _scroll_id
-                'scroll' => '30s',        // and the same timeout window
+                'scroll_id' => $scroll_id, //...using our previously obtained _scroll_id
+                'scroll' => '30s', // and the same timeout window
             ]
             );
         }

Blacklight/ReleaseCleaning.php

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
                 foreach ($hit as $val) {
                     $title = Predb::query()->where('title', trim($val))->first(['title', 'id']);
                     // don't match against ab.teevee if title is for just the season
-                    if (! empty($title) && $groupName === 'alt.binaries.teevee' && preg_match('/\.S\d\d\./', $title['title'], $hit)) {
+                    if (!empty($title) && $groupName === 'alt.binaries.teevee' && preg_match('/\.S\d\d\./', $title['title'], $hit)) {
                         $title = null;
                     }
                     if ($title !== null) {
@@ -158,7 +158,7 @@ 
                     }
                     break;
             }
-            if ($title === null && ! empty($reqGname)) {
+            if ($title === null && !empty($reqGname)) {
                 $title = Predb::query()->where(['predb.requestid' => $hit[1], 'g.name' => $reqGname])->join('usenet_groups as g', 'g.id', '=', 'predb.groups_id')->first(['predb.title', 'predb.id']);
             }
             // don't match against ab.teevee if title is for just the season

Blacklight/Contents.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
             $content['url'] = '/'.$content['url'];
         }
 
-        if (! str_ends_with($content['url'], '/')) {
+        if (!str_ends_with($content['url'], '/')) {
             $content['url'] .= '/';
         }
 

Blacklight/Tmux.php

Spacing +5 added lines, -5 removed lines

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

app/Http/Requests/Auth/RegisterRegisterRequest.php

Spacing +1 added lines, -1 removed lines

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

Blacklight/Books.php

Spacing +9 added lines, -9 removed lines

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

Blacklight/Categorize.php

Spacing +15 added lines, -15 removed lines

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