AOEpeople / crawler

Classes/ClickMenu/CrawlerClickMenu.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
         $additionalParameters = [];
         $additionalParameters[] = 'SET[function]=tx_crawler_modfunc1';
         $additionalParameters[] = 'SET[crawlaction]=start';
-        $additionalParameters[] = 'configurationSelection[]=' . $crawlerConfiguration['name'];
+        $additionalParameters[] = 'configurationSelection[]='.$crawlerConfiguration['name'];
 
         $additionalMenuItems = [];
         $additionalMenuItems[] = $backRef->linkItem(
@@ -76,7 +76,7 @@ 
                 'crawler'
             ),
             $this->getContextMenuIcon(),
-            'top.goToModule(\'web_info\', 1, \'&' . implode('&', $additionalParameters) . '\'); return hideCM();'
+            'top.goToModule(\'web_info\', 1, \'&'.implode('&', $additionalParameters).'\'); return hideCM();'
         );
 
         return array_merge($menuItems, $additionalMenuItems);
@@ -91,7 +91,7 @@ 
     {
         $icon = sprintf(
             '<img src="%s" border="0" align="top" alt="" />',
-            ExtensionManagementUtility::extRelPath('crawler') . 'Resources/Private/Icons/icon_tx_crawler_configuration.gif'
+            ExtensionManagementUtility::extRelPath('crawler').'Resources/Private/Icons/icon_tx_crawler_configuration.gif'
         );
 
         return $icon;

Classes/Task/CrawlerQueueTaskAdditionalFieldProvider.php

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
 
         // input for startPage
         $fieldId = 'task_startPage';
-        $fieldCode = '<input name="tx_scheduler[startPage]" type="text" id="' . $fieldId . '" value="' . $task->startPage . '" class="form-control" />';
+        $fieldCode = '<input name="tx_scheduler[startPage]" type="text" id="'.$fieldId.'" value="'.$task->startPage.'" class="form-control" />';
         $additionalFields[$fieldId] = [
             'code' => $fieldCode,
             'label' => 'LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_im.startPage'
@@ -104,10 +104,10 @@ 
             '4' => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_4'),
             '99' => $GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.depth_infi'),
         ];
-        $fieldCode = '<select name="tx_scheduler[depth]" id="' . $fieldId . '" class="form-control">';
+        $fieldCode = '<select name="tx_scheduler[depth]" id="'.$fieldId.'" class="form-control">';
 
         foreach ($fieldValueArray as $key => $label) {
-            $fieldCode .= "\t" . '<option value="' . $key . '"' . (($key == $task->depth) ? ' selected="selected"' : '') . '>' . $label . '</option>';
+            $fieldCode .= "\t".'<option value="'.$key.'"'.(($key == $task->depth) ? ' selected="selected"' : '').'>'.$label.'</option>';
         }
 
         $fieldCode .= '</select>';
@@ -119,10 +119,10 @@ 
         // combobox for configuration records
         $recordsArray = $this->getCrawlerConfigurationRecords();
         $fieldId = 'task_configuration';
-        $fieldCode = '<select name="tx_scheduler[configuration][]" multiple="multiple" id="' . $fieldId . '" class="form-control">';
-        $fieldCode .= "\t" . '<option value=""></option>';
+        $fieldCode = '<select name="tx_scheduler[configuration][]" multiple="multiple" id="'.$fieldId.'" class="form-control">';
+        $fieldCode .= "\t".'<option value=""></option>';
         for ($i = 0; $i < count($recordsArray); $i++) {
-            $fieldCode .= "\t" . '<option ' . $this->getSelectedState($task->configuration, $recordsArray[$i]['name']) . 'value="' . $recordsArray[$i]['name'] . '">' . $recordsArray[$i]['name'] . '</option>';
+            $fieldCode .= "\t".'<option '.$this->getSelectedState($task->configuration, $recordsArray[$i]['name']).'value="'.$recordsArray[$i]['name'].'">'.$recordsArray[$i]['name'].'</option>';
         }
         $fieldCode .= '</select>';
 
@@ -165,7 +165,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'tx_crawler_configuration',
-            '1=1' . BackendUtility::deleteClause('tx_crawler_configuration')
+            '1=1'.BackendUtility::deleteClause('tx_crawler_configuration')
         );
 
         while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {

Classes/Api/CrawlerApi.php

Spacing +8 added lines, -8 removed lines

@@ -192,12 +192,12 @@ 
         //if the same page is scheduled for the same time and has not be executed?
         if ($schedule_timestamp == 0) {
             //untimed elements need an exec_time with 0 because they can occure multiple times
-            $where = 'page_id=' . $page_uid . ' AND exec_time = 0 AND scheduled=' . $schedule_timestamp;
+            $where = 'page_id='.$page_uid.' AND exec_time = 0 AND scheduled='.$schedule_timestamp;
         } else {
             //timed elementes have got a fixed schedule time, if a record with this time
             //exists it is maybe queued for the future, or is has been queue for the past and therefore
             //also been processed.
-            $where = 'page_id=' . $page_uid . ' AND scheduled=' . $schedule_timestamp;
+            $where = 'page_id='.$page_uid.' AND scheduled='.$schedule_timestamp;
         }
 
         $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -227,7 +227,7 @@ 
 
         $isPageInQueue = false;
 
-        $whereClause = 'page_id = ' . (integer)$uid;
+        $whereClause = 'page_id = '.(integer) $uid;
 
         if (false !== $unprocessed_only) {
             $whereClause .= ' AND exec_time = 0';
@@ -238,7 +238,7 @@ 
         }
 
         if (false !== $timestamp) {
-            $whereClause .= ' AND scheduled = ' . (integer)$timestamp;
+            $whereClause .= ' AND scheduled = '.(integer) $timestamp;
         }
 
         $count = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows(
@@ -267,10 +267,10 @@ 
     {
         $uid = intval($uid);
         $query = 'max(scheduled) as latest';
-        $where = ' page_id = ' . $uid;
+        $where = ' page_id = '.$uid;
 
         if ($future_crawldates_only) {
-            $where .= ' AND scheduled > ' . time();
+            $where .= ' AND scheduled > '.time();
         }
 
         if ($unprocessed_only) {
@@ -303,7 +303,7 @@ 
         $limit = $GLOBALS['TYPO3_DB']->fullQuoteStr($limit, 'tx_crawler_queue');
 
         $query = 'scheduled, exec_time, set_id';
-        $where = ' page_id = ' . $uid;
+        $where = ' page_id = '.$uid;
 
         $limit_query = ($limit) ? $limit : null;
 
@@ -380,7 +380,7 @@ 
     {
         $qid = intval($qid);
         $table = 'tx_crawler_queue';
-        $where = ' qid=' . $qid;
+        $where = ' qid='.$qid;
         $GLOBALS['TYPO3_DB']->exec_DELETEquery($table, $where);
     }
 

Classes/Hooks/TsfeHook.php

Spacing +5 added lines, -5 removed lines

@@ -49,10 +49,10 @@ 
             //@todo: ask service to exclude current call for special reasons: for example no relevance because the language version is not affected
 
             list($queueId, $hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']);
-            list($queueRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid=' . intval($queueId));
+            list($queueRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval($queueId));
 
             // If a crawler record was found and hash was matching, set it up:
-            if (is_array($queueRec) && $hash === md5($queueRec['qid'] . '|' . $queueRec['set_id'] . '|' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
+            if (is_array($queueRec) && $hash === md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) {
                 $params['pObj']->applicationData['tx_crawler']['running'] = true;
                 $params['pObj']->applicationData['tx_crawler']['parameters'] = unserialize($queueRec['parameters']);
                 $params['pObj']->applicationData['tx_crawler']['log'] = [];
@@ -80,7 +80,7 @@ 
                     $params['pObj']->fe_user->user = [];
                 }
                 $params['pObj']->fe_user->user['usergroup'] = $grList;
-                $params['pObj']->applicationData['tx_crawler']['log'][] = 'User Groups: ' . $grList;
+                $params['pObj']->applicationData['tx_crawler']['log'][] = 'User Groups: '.$grList;
             }
         }
     }
@@ -125,7 +125,7 @@ 
                 foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'] as $pollable) {
                     if (is_array($params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions']) && in_array($pollable, $params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions'])) {
                         if (empty($params['pObj']->applicationData['tx_crawler']['success'][$pollable])) {
-                            $params['pObj']->applicationData['tx_crawler']['errorlog'][] = 'Error: Pollable extension (' . $pollable . ') did not complete successfully.';
+                            $params['pObj']->applicationData['tx_crawler']['errorlog'][] = 'Error: Pollable extension ('.$pollable.') did not complete successfully.';
                         }
                     }
                 }
@@ -135,7 +135,7 @@ 
             $str = serialize($params['pObj']->applicationData['tx_crawler']);
             //just make sure that no other output distracts this
             ob_clean();
-            header('Content-Length: ' . strlen($str));
+            header('Content-Length: '.strlen($str));
             echo $str;
             // Exit since we don't want anymore output!
             exit;

Classes/Utility/TcaUtility.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
     {
         if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['procInstructions'])) {
             foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['procInstructions'] as $key => $value) {
-                $configuration['items'][] = [$value . ' [' . $key . ']', $key, $this->getExtensionIcon($key)];
+                $configuration['items'][] = [$value.' ['.$key.']', $key, $this->getExtensionIcon($key)];
             }
         }
 
@@ -59,8 +59,8 @@ 
         if (method_exists(ExtensionManagementUtility::class, 'getExtensionKeyByPrefix')) {
             $parts = explode('_', $key);
             if (is_array($parts) && count($parts) > 2) {
-                $extensionKey = ExtensionManagementUtility::getExtensionKeyByPrefix('tx_' . $parts[1]);
-                $extIcon = ExtensionManagementUtility::siteRelPath($extensionKey) . 'ext_icon.gif';
+                $extensionKey = ExtensionManagementUtility::getExtensionKeyByPrefix('tx_'.$parts[1]);
+                $extIcon = ExtensionManagementUtility::siteRelPath($extensionKey).'ext_icon.gif';
             }
         }
 

Classes/Domain/Repository/QueueRepository.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     {
         $db = $this->getDB();
         $where = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) .
-                   ' AND exec_time > 0 ';
+                    ' AND exec_time > 0 ';
         $limit = 1;
         $groupby = '';
 

Spacing +10 added lines, -10 removed lines

@@ -63,7 +63,7 @@ 
     protected function getFirstOrLastObjectByProcess($process, $orderby)
     {
         $db = $this->getDB();
-        $where = 'process_id_completed=' . $db->fullQuoteStr($process->getProcess_id(), $this->tableName) .
+        $where = 'process_id_completed='.$db->fullQuoteStr($process->getProcess_id(), $this->tableName).
                    ' AND exec_time > 0 ';
         $limit = 1;
         $groupby = '';
@@ -88,7 +88,7 @@ 
      */
     public function countExecutedItemsByProcess($process)
     {
-        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = ' . $this->getDB()->fullQuoteStr(
+        return $this->countItemsByWhereClause('exec_time > 0 AND process_id_completed = '.$this->getDB()->fullQuoteStr(
             $process->getProcess_id(),
                 $this->tableName
         ));
@@ -103,7 +103,7 @@ 
      */
     public function countNonExecutedItemsByProcess($process)
     {
-        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = ' . $this->getDB()->fullQuoteStr(
+        return $this->countItemsByWhereClause('exec_time = 0 AND process_id = '.$this->getDB()->fullQuoteStr(
             $process->getProcess_id(),
                 $this->tableName
         ));
@@ -119,7 +119,7 @@ 
      */
     public function countAllPendingItems()
     {
-        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < ' . time());
+        return $this->countItemsByWhereClause('exec_time = 0 AND scheduled < '.time());
     }
 
     /**
@@ -132,7 +132,7 @@ 
      */
     public function countAllAssignedPendingItems()
     {
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id != ''");
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id != ''");
     }
 
     /**
@@ -145,7 +145,7 @@ 
      */
     public function countAllUnassignedPendingItems()
     {
-        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < " . time() . " AND process_id = ''");
+        return $this->countItemsByWhereClause("exec_time = 0 AND scheduled < ".time()." AND process_id = ''");
     }
 
     /**
@@ -175,7 +175,7 @@ 
         $res = $db->exec_SELECTquery(
             "configuration, count(*) as unprocessed, sum(process_id != '') as assignedButUnprocessed",
             $this->tableName,
-            'exec_time = 0 AND scheduled < ' . time(),
+            'exec_time = 0 AND scheduled < '.time(),
             'configuration'
         );
         $rows = [];
@@ -199,7 +199,7 @@ 
         $res = $db->exec_SELECTquery(
             'set_id',
             $this->tableName,
-            'exec_time = 0 AND scheduled < ' . time(),
+            'exec_time = 0 AND scheduled < '.time(),
             'set_id'
         );
         $setIds = [];
@@ -225,7 +225,7 @@ 
             $res = $db->exec_SELECTquery(
                 'configuration, count(*) as c',
                 $this->tableName,
-                'set_id in (' . implode(',', $setIds) . ') AND scheduled < ' . time(),
+                'set_id in ('.implode(',', $setIds).') AND scheduled < '.time(),
                 'configuration'
             );
             while ($row = $db->sql_fetch_assoc($res)) {
@@ -305,7 +305,7 @@ 
         $res = $db->exec_SELECTquery(
             'process_id_completed, min(exec_time) as start, max(exec_time) as end, count(*) as urlcount',
             $this->tableName,
-            'exec_time != 0 and exec_time >= ' . intval($start) . ' and exec_time <= ' . intval($end),
+            'exec_time != 0 and exec_time >= '.intval($start).' and exec_time <= '.intval($end),
             'process_id_completed'
         );
 

Classes/Domain/Repository/ProcessRepository.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
             $this->tableName,
             $where,
             '',
-            htmlspecialchars($orderField) . ' ' . htmlspecialchars($orderDirection),
+            htmlspecialchars($orderField).' '.htmlspecialchars($orderDirection),
             self::getLimitFromItemCountAndOffset($itemCount, $offset)
         );
 
@@ -111,7 +111,7 @@ 
      */
     public function countNotTimeouted($ttl)
     {
-        return $this->countByWhere('deleted = 0 AND ttl > ' . intval($ttl));
+        return $this->countByWhere('deleted = 0 AND ttl > '.intval($ttl));
     }
 
     /**
@@ -127,7 +127,7 @@ 
     {
         $itemCount = filter_var($itemCount, FILTER_VALIDATE_INT, ['options' => ['min_range' => 1, 'default' => 20]]);
         $offset = filter_var($offset, FILTER_VALIDATE_INT, ['options' => ['min_range' => 0, 'default' => 0]]);
-        $limit = $offset . ', ' . $itemCount;
+        $limit = $offset.', '.$itemCount;
 
         return $limit;
     }

template/process/list.php

Braces +5 added lines, -2 removed lines

@@ -71,8 +71,11 @@
 					</div>
 				<?php elseif ($process->getState() == 'cancelled'): ?>
 					<?php echo $this->getLLLabel('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.process.cancelled'); ?>
-				<?php else: ?>
-					<?php echo $this->getLLLabel('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.process.success'); ?>
+				<?php else {
+    : ?>
+					<?php echo $this->getLLLabel('LLL:EXT:crawler/Resources/Private/Language/locallang.xml:labels.process.success');
+}
+?>
 				<?php endif; ?>
 				</td>
 			</tr>

Classes/Service/ProcessService.php

Spacing +14 added lines, -14 removed lines

@@ -96,7 +96,7 @@ 
     public function multiProcess($timeout)
     {
         if ($this->processLimit <= 1) {
-            throw new \RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.' . PHP_EOL);
+            throw new \RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.'.PHP_EOL);
         }
 
         $pendingItemsStart = $this->queueRepository->countAllPendingItems();
@@ -114,7 +114,7 @@ 
             }
             if ($currentPendingItems == 0) {
                 if ($this->verbose) {
-                    echo 'Finished...' . chr(10);
+                    echo 'Finished...'.chr(10);
                 }
                 break;
             }
@@ -126,16 +126,16 @@ 
             }
             sleep(1);
             if ($nextTimeOut < time()) {
-                $timedOutProcesses = $this->processRepository->findAll('', 'DESC', null, 0, 'ttl >' . $nextTimeOut);
+                $timedOutProcesses = $this->processRepository->findAll('', 'DESC', null, 0, 'ttl >'.$nextTimeOut);
                 $nextTimeOut = time() + $this->timeToLive;
                 if ($this->verbose) {
-                    echo 'Cleanup' . implode(',', $timedOutProcesses->getProcessIds()) . chr(10);
+                    echo 'Cleanup'.implode(',', $timedOutProcesses->getProcessIds()).chr(10);
                 }
                 $this->crawlerObj->CLI_releaseProcesses($timedOutProcesses->getProcessIds(), true);
             }
         }
         if ($currentPendingItems > 0 && $this->verbose) {
-            echo 'Stop with timeout' . chr(10);
+            echo 'Stop with timeout'.chr(10);
         }
     }
 
@@ -144,7 +144,7 @@ 
      */
     protected function reportItemStatus()
     {
-        echo 'Pending:' . $this->queueRepository->countAllPendingItems() . ' / Assigned:' . $this->queueRepository->countAllAssignedPendingItems() . chr(10);
+        echo 'Pending:'.$this->queueRepository->countAllPendingItems().' / Assigned:'.$this->queueRepository->countAllAssignedPendingItems().chr(10);
     }
 
     /**
@@ -161,14 +161,14 @@ 
         $currentProcesses = $this->processRepository->countActive();
         $availableProcessesCount = $this->processLimit - $currentProcesses;
         $requiredProcessesCount = ceil($this->queueRepository->countAllUnassignedPendingItems() / $this->countInARun);
-        $startProcessCount = min([$availableProcessesCount,$requiredProcessesCount]);
+        $startProcessCount = min([$availableProcessesCount, $requiredProcessesCount]);
         if ($startProcessCount <= 0) {
             return $ret;
         }
         if ($startProcessCount && $this->verbose) {
-            echo 'Start ' . $startProcessCount . ' new processes (Running:' . $currentProcesses . ')';
+            echo 'Start '.$startProcessCount.' new processes (Running:'.$currentProcesses.')';
         }
-        for ($i = 0;$i < $startProcessCount;$i++) {
+        for ($i = 0; $i < $startProcessCount; $i++) {
             usleep(100);
             if ($this->startProcess()) {
                 if ($this->verbose) {
@@ -194,16 +194,16 @@ 
 
         // Check whether OS is Windows
         if (TYPO3_OS === 'WIN') {
-            $completePath = escapeshellcmd('start ' . $this->getCrawlerCliPath());
+            $completePath = escapeshellcmd('start '.$this->getCrawlerCliPath());
         } else {
-            $completePath = '(' . escapeshellcmd($this->getCrawlerCliPath()) . ' &) > /dev/null';
+            $completePath = '('.escapeshellcmd($this->getCrawlerCliPath()).' &) > /dev/null';
         }
 
         $fileHandler = system($completePath);
         if ($fileHandler === false) {
             throw new \Exception('could not start process!');
         } else {
-            for ($i = 0;$i < 10;$i++) {
+            for ($i = 0; $i < 10; $i++) {
                 if ($this->processRepository->countNotTimeouted($ttl) > $current) {
                     return true;
                 }
@@ -220,11 +220,11 @@ 
      */
     public function getCrawlerCliPath()
     {
-        $phpPath = $this->crawlerObj->extensionSettings['phpPath'] . ' ';
+        $phpPath = $this->crawlerObj->extensionSettings['phpPath'].' ';
         $pathToTypo3 = rtrim(GeneralUtility::getIndpEnv('TYPO3_DOCUMENT_ROOT'), '/');
         $pathToTypo3 .= rtrim(GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'), '/');
         $cliPart = '/typo3/cli_dispatch.phpsh crawler';
-        $scriptPath = $phpPath . $pathToTypo3 . $cliPart;
+        $scriptPath = $phpPath.$pathToTypo3.$cliPart;
 
         if (TYPO3_OS === 'WIN') {
             $scriptPath = str_replace('/', '\\', $scriptPath);