@@ -24,121 +24,121 @@ |
||
| 24 | 24 | |
| 25 | 25 | class tx_crawler_view_pagination { |
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * @var string template path |
|
| 29 | - */ |
|
| 30 | - protected $template = 'EXT:crawler/template/pagination.php'; |
|
| 31 | - |
|
| 32 | - /** |
|
| 33 | - * @var int $perpage number of items perPage |
|
| 34 | - */ |
|
| 35 | - protected $perPage; |
|
| 36 | - |
|
| 37 | - /** |
|
| 38 | - * @var int $currentOffset current offset |
|
| 39 | - */ |
|
| 40 | - protected $currentOffset; |
|
| 41 | - |
|
| 42 | - /** |
|
| 43 | - * @var int $totalItemCount number of total item |
|
| 44 | - */ |
|
| 45 | - protected $totalItemCount; |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * @var string $baseUrl |
|
| 49 | - */ |
|
| 50 | - protected $baseUrl; |
|
| 51 | - |
|
| 52 | - |
|
| 53 | - |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * Method to render the view. |
|
| 57 | - * |
|
| 58 | - * @return string html content |
|
| 59 | - */ |
|
| 60 | - public function render() { |
|
| 61 | - ob_start(); |
|
| 62 | - $this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template); |
|
| 63 | - include($this->template); |
|
| 64 | - $content = ob_get_contents(); |
|
| 65 | - ob_end_clean(); |
|
| 66 | - |
|
| 67 | - return $content; |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * Returns the currently configured offset- |
|
| 72 | - * @return int |
|
| 73 | - */ |
|
| 74 | - public function getCurrentOffset() { |
|
| 75 | - return $this->currentOffset; |
|
| 76 | - } |
|
| 77 | - |
|
| 78 | - /** |
|
| 79 | - * Method to read the number of items per page |
|
| 80 | - * |
|
| 81 | - * @return int |
|
| 82 | - */ |
|
| 83 | - public function getPerPage() { |
|
| 84 | - return $this->perPage; |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - /** |
|
| 88 | - * Method to set the current offset from start |
|
| 89 | - * |
|
| 90 | - * @param int $currentOffset |
|
| 91 | - */ |
|
| 92 | - public function setCurrentOffset($currentOffset) { |
|
| 93 | - $this->currentOffset = $currentOffset; |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - /** |
|
| 97 | - * Number of items per page. |
|
| 98 | - * |
|
| 99 | - * @param int $perPage |
|
| 100 | - */ |
|
| 101 | - public function setPerPage($perPage) { |
|
| 102 | - $this->perPage = $perPage; |
|
| 103 | - } |
|
| 104 | - |
|
| 105 | - /** |
|
| 106 | - * returns the total number of items |
|
| 107 | - * @return int |
|
| 108 | - */ |
|
| 109 | - public function getTotalItemCount() { |
|
| 110 | - return $this->totalItemCount; |
|
| 111 | - } |
|
| 112 | - |
|
| 113 | - /** |
|
| 114 | - * Method to set the total number of items in the pagination |
|
| 115 | - * |
|
| 116 | - * @param int $totalItemCount |
|
| 117 | - */ |
|
| 118 | - public function setTotalItemCount($totalItemCount) { |
|
| 119 | - $this->totalItemCount = $totalItemCount; |
|
| 120 | - } |
|
| 121 | - |
|
| 122 | - /** |
|
| 123 | - * Returns the total number of pages needed to display all content which |
|
| 124 | - * is paginatable |
|
| 125 | - * |
|
| 126 | - * @return double |
|
| 127 | - */ |
|
| 128 | - public function getTotalPagesCount() { |
|
| 129 | - return ceil($this->getTotalItemCount() / $this->getPerPage()); |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - /** |
|
| 133 | - * This method is used to caluclate the label for a pageoffset, |
|
| 134 | - * in normal cases its the internal offset + 1 |
|
| 135 | - * |
|
| 136 | - * @param int $pageoffset |
|
| 137 | - * @return int |
|
| 138 | - */ |
|
| 139 | - protected function getLabelForPageOffset($pageoffset) { |
|
| 140 | - return $pageoffset + 1; |
|
| 141 | - } |
|
| 27 | + /** |
|
| 28 | + * @var string template path |
|
| 29 | + */ |
|
| 30 | + protected $template = 'EXT:crawler/template/pagination.php'; |
|
| 31 | + |
|
| 32 | + /** |
|
| 33 | + * @var int $perpage number of items perPage |
|
| 34 | + */ |
|
| 35 | + protected $perPage; |
|
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * @var int $currentOffset current offset |
|
| 39 | + */ |
|
| 40 | + protected $currentOffset; |
|
| 41 | + |
|
| 42 | + /** |
|
| 43 | + * @var int $totalItemCount number of total item |
|
| 44 | + */ |
|
| 45 | + protected $totalItemCount; |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * @var string $baseUrl |
|
| 49 | + */ |
|
| 50 | + protected $baseUrl; |
|
| 51 | + |
|
| 52 | + |
|
| 53 | + |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * Method to render the view. |
|
| 57 | + * |
|
| 58 | + * @return string html content |
|
| 59 | + */ |
|
| 60 | + public function render() { |
|
| 61 | + ob_start(); |
|
| 62 | + $this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template); |
|
| 63 | + include($this->template); |
|
| 64 | + $content = ob_get_contents(); |
|
| 65 | + ob_end_clean(); |
|
| 66 | + |
|
| 67 | + return $content; |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * Returns the currently configured offset- |
|
| 72 | + * @return int |
|
| 73 | + */ |
|
| 74 | + public function getCurrentOffset() { |
|
| 75 | + return $this->currentOffset; |
|
| 76 | + } |
|
| 77 | + |
|
| 78 | + /** |
|
| 79 | + * Method to read the number of items per page |
|
| 80 | + * |
|
| 81 | + * @return int |
|
| 82 | + */ |
|
| 83 | + public function getPerPage() { |
|
| 84 | + return $this->perPage; |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + /** |
|
| 88 | + * Method to set the current offset from start |
|
| 89 | + * |
|
| 90 | + * @param int $currentOffset |
|
| 91 | + */ |
|
| 92 | + public function setCurrentOffset($currentOffset) { |
|
| 93 | + $this->currentOffset = $currentOffset; |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + /** |
|
| 97 | + * Number of items per page. |
|
| 98 | + * |
|
| 99 | + * @param int $perPage |
|
| 100 | + */ |
|
| 101 | + public function setPerPage($perPage) { |
|
| 102 | + $this->perPage = $perPage; |
|
| 103 | + } |
|
| 104 | + |
|
| 105 | + /** |
|
| 106 | + * returns the total number of items |
|
| 107 | + * @return int |
|
| 108 | + */ |
|
| 109 | + public function getTotalItemCount() { |
|
| 110 | + return $this->totalItemCount; |
|
| 111 | + } |
|
| 112 | + |
|
| 113 | + /** |
|
| 114 | + * Method to set the total number of items in the pagination |
|
| 115 | + * |
|
| 116 | + * @param int $totalItemCount |
|
| 117 | + */ |
|
| 118 | + public function setTotalItemCount($totalItemCount) { |
|
| 119 | + $this->totalItemCount = $totalItemCount; |
|
| 120 | + } |
|
| 121 | + |
|
| 122 | + /** |
|
| 123 | + * Returns the total number of pages needed to display all content which |
|
| 124 | + * is paginatable |
|
| 125 | + * |
|
| 126 | + * @return double |
|
| 127 | + */ |
|
| 128 | + public function getTotalPagesCount() { |
|
| 129 | + return ceil($this->getTotalItemCount() / $this->getPerPage()); |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + /** |
|
| 133 | + * This method is used to caluclate the label for a pageoffset, |
|
| 134 | + * in normal cases its the internal offset + 1 |
|
| 135 | + * |
|
| 136 | + * @param int $pageoffset |
|
| 137 | + * @return int |
|
| 138 | + */ |
|
| 139 | + protected function getLabelForPageOffset($pageoffset) { |
|
| 140 | + return $pageoffset + 1; |
|
| 141 | + } |
|
| 142 | 142 | |
| 143 | 143 | } |
| 144 | 144 | |
@@ -42,36 +42,36 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\CrawlerQueueTask'] = array( |
| 44 | 44 | 'extension' => $extKey, |
| 45 | - 'title' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_im.name', |
|
| 46 | - 'description' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_im.description', |
|
| 45 | + 'title' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_im.name', |
|
| 46 | + 'description' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_im.description', |
|
| 47 | 47 | 'additionalFields' => 'AOE\\Crawler\\Task\\CrawlerQueueTaskAdditionalFieldProvider' |
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | 50 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\CrawlerTask'] = array( |
| 51 | 51 | 'extension' => $extKey, |
| 52 | - 'title' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawl.name', |
|
| 53 | - 'description' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawl.description', |
|
| 52 | + 'title' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawl.name', |
|
| 53 | + 'description' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawl.description', |
|
| 54 | 54 | 'additionalFields' => 'AOE\\Crawler\\Task\\CrawlerTaskAdditionalFieldProvider' |
| 55 | 55 | ); |
| 56 | 56 | |
| 57 | 57 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\CrawlMultiProcessTask'] = array( |
| 58 | 58 | 'extension' => $extKey, |
| 59 | - 'title' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawlMultiProcess.name', |
|
| 60 | - 'description' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawl.description', |
|
| 59 | + 'title' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawlMultiProcess.name', |
|
| 60 | + 'description' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawl.description', |
|
| 61 | 61 | 'additionalFields' => 'AOE\\Crawler\\Task\\CrawlMultiProcessTaskAdditionalFieldProvider' |
| 62 | 62 | ); |
| 63 | 63 | |
| 64 | 64 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\FlushQueueTask'] = array( |
| 65 | 65 | 'extension' => $extKey, |
| 66 | - 'title' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_flush.name', |
|
| 67 | - 'description' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_flush.description', |
|
| 66 | + 'title' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_flush.name', |
|
| 67 | + 'description' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_flush.description', |
|
| 68 | 68 | 'additionalFields' => 'AOE\\Crawler\\Task\\FlushQueueTaskAdditionalFieldProvider' |
| 69 | 69 | ); |
| 70 | 70 | |
| 71 | 71 | $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\ProcessCleanupTask'] = array( |
| 72 | 72 | 'extension' => $extKey, |
| 73 | - 'title' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_processCleanup.name', |
|
| 74 | - 'description' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_processCleanup.description', |
|
| 73 | + 'title' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_processCleanup.name', |
|
| 74 | + 'description' => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_processCleanup.description', |
|
| 75 | 75 | ); |
| 76 | 76 | } |
| 77 | 77 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | { |
| 47 | 47 | if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['procInstructions'])) { |
| 48 | 48 | foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['procInstructions'] as $key => $value) { |
| 49 | - $configuration['items'][] = array($value . ' [' . $key . ']', $key, $this->getExtensionIcon($key)); |
|
| 49 | + $configuration['items'][] = array($value.' ['.$key.']', $key, $this->getExtensionIcon($key)); |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | if (method_exists('TYPO3\\CMS\\Core\\Utility\\ExtensionManagementUtility', 'getExtensionKeyByPrefix')) { |
| 67 | 67 | $parts = explode('_', $key); |
| 68 | 68 | if (is_array($parts) && count($parts) > 2) { |
| 69 | - $extensionKey = ExtensionManagementUtility::getExtensionKeyByPrefix('tx_' . $parts[1]); |
|
| 70 | - $extIcon = ExtensionManagementUtility::extRelPath($extensionKey) . 'ext_icon.gif'; |
|
| 69 | + $extensionKey = ExtensionManagementUtility::getExtensionKeyByPrefix('tx_'.$parts[1]); |
|
| 70 | + $extIcon = ExtensionManagementUtility::extRelPath($extensionKey).'ext_icon.gif'; |
|
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $templateUid = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow( |
| 48 | 48 | '*', |
| 49 | 49 | 'sys_template', |
| 50 | - 'root=1 AND pid=' . (int)$page['uid'] . |
|
| 50 | + 'root=1 AND pid='.(int) $page['uid']. |
|
| 51 | 51 | \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('sys_template') |
| 52 | 52 | ); |
| 53 | 53 | |
@@ -48,8 +48,8 @@ discard block |
||
| 48 | 48 | if (isset($_SERVER['HTTP_X_T3CRAWLER'])) { |
| 49 | 49 | //@todo: ask service to exclude current call for special reasons: for example no relevance because the language version is not affected |
| 50 | 50 | |
| 51 | - list($queueId,$hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']); |
|
| 52 | - list($queueRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*','tx_crawler_queue','qid='.intval($queueId)); |
|
| 51 | + list($queueId, $hash) = explode(':', $_SERVER['HTTP_X_T3CRAWLER']); |
|
| 52 | + list($queueRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'tx_crawler_queue', 'qid='.intval($queueId)); |
|
| 53 | 53 | |
| 54 | 54 | // If a crawler record was found and hash was matching, set it up: |
| 55 | 55 | if (is_array($queueRec) && $hash === md5($queueRec['qid'].'|'.$queueRec['set_id'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) { |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | * Required because some extensions (staticpub) might never be requested to run due to some Core side effects |
| 120 | 120 | * and since this is considered as error the crawler should handle it properly |
| 121 | 121 | */ |
| 122 | - if(is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'])) { |
|
| 123 | - foreach($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'] as $pollable) { |
|
| 124 | - if(is_array($params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions']) && in_array($pollable,$params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions'])){ |
|
| 125 | - if(empty($params['pObj']->applicationData['tx_crawler']['success'][$pollable])) { |
|
| 122 | + if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'])) { |
|
| 123 | + foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['crawler']['pollSuccess'] as $pollable) { |
|
| 124 | + if (is_array($params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions']) && in_array($pollable, $params['pObj']->applicationData['tx_crawler']['content']['parameters']['procInstructions'])) { |
|
| 125 | + if (empty($params['pObj']->applicationData['tx_crawler']['success'][$pollable])) { |
|
| 126 | 126 | $params['pObj']->applicationData['tx_crawler']['errorlog'][] = 'Error: Pollable extension ('.$pollable.') did not complete successfully.'; |
| 127 | 127 | } |
| 128 | 128 | } |
@@ -76,7 +76,9 @@ |
||
| 76 | 76 | if ($params['pObj']->applicationData['tx_crawler']['running']) { |
| 77 | 77 | $grList = $params['pObj']->applicationData['tx_crawler']['parameters']['feUserGroupList']; |
| 78 | 78 | if ($grList) { |
| 79 | - if (!is_array($params['pObj']->fe_user->user)) $params['pObj']->fe_user->user = []; |
|
| 79 | + if (!is_array($params['pObj']->fe_user->user)) { |
|
| 80 | + $params['pObj']->fe_user->user = []; |
|
| 81 | + } |
|
| 80 | 82 | $params['pObj']->fe_user->user['usergroup'] = $grList; |
| 81 | 83 | $params['pObj']->applicationData['tx_crawler']['log'][] = 'User Groups: '.$grList; |
| 82 | 84 | } |
@@ -70,14 +70,14 @@ discard block |
||
| 70 | 70 | $results = $this->getDatabaseConnection()->exec_SELECTgetRows( |
| 71 | 71 | 'process_id, system_process_id', |
| 72 | 72 | 'tx_crawler_process', |
| 73 | - 'ttl <= ' . intval(time() - $this->extensionSettings['processMaxRunTime'] - 3600) . ' AND active = 1' |
|
| 73 | + 'ttl <= '.intval(time() - $this->extensionSettings['processMaxRunTime'] - 3600).' AND active = 1' |
|
| 74 | 74 | ); |
| 75 | 75 | |
| 76 | 76 | if (!is_array($results)) { |
| 77 | 77 | return; |
| 78 | 78 | } |
| 79 | 79 | foreach ($results as $result) { |
| 80 | - $systemProcessId = (int)$result['system_process_id']; |
|
| 80 | + $systemProcessId = (int) $result['system_process_id']; |
|
| 81 | 81 | $processId = $result['process_id']; |
| 82 | 82 | if ($systemProcessId > 1) { |
| 83 | 83 | if ($this->doProcessStillExists($systemProcessId)) { |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $results = $this->getDatabaseConnection()->exec_SELECTgetRows( |
| 99 | 99 | 'process_id, system_process_id', |
| 100 | 100 | 'tx_crawler_process', |
| 101 | - 'ttl <= ' . intval(time() - $this->extensionSettings['processMaxRunTime']) . ' AND active = 1' |
|
| 101 | + 'ttl <= '.intval(time() - $this->extensionSettings['processMaxRunTime']).' AND active = 1' |
|
| 102 | 102 | ); |
| 103 | 103 | |
| 104 | 104 | if (!is_array($results)) { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | } |
| 107 | 107 | foreach ($results as $result) { |
| 108 | 108 | $processExists = false; |
| 109 | - $systemProcessId = (int)$result['system_process_id']; |
|
| 109 | + $systemProcessId = (int) $result['system_process_id']; |
|
| 110 | 110 | $processId = $result['process_id']; |
| 111 | 111 | if ($systemProcessId > 1) { |
| 112 | 112 | $dispatcherProcesses = $this->findDispatcherProcesses(); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | foreach ($dispatcherProcesses as $process) { |
| 118 | 118 | $responseArray = $this->createResponseArray($process); |
| 119 | - if ($systemProcessId === (int)$responseArray[1]) { |
|
| 119 | + if ($systemProcessId === (int) $responseArray[1]) { |
|
| 120 | 120 | $processExists = true; |
| 121 | 121 | }; |
| 122 | 122 | } |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | { |
| 139 | 139 | $this->getDatabaseConnection()->exec_DELETEquery( |
| 140 | 140 | 'tx_crawler_process', |
| 141 | - 'process_id = ' . $this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_process') |
|
| 141 | + 'process_id = '.$this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_process') |
|
| 142 | 142 | ); |
| 143 | 143 | |
| 144 | 144 | $this->getDatabaseConnection()->exec_UPDATEquery( |
| 145 | 145 | 'tx_crawler_queue', |
| 146 | - 'process_id = ' . $this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_queue'), |
|
| 146 | + 'process_id = '.$this->getDatabaseConnection()->fullQuoteStr($processId, 'tx_crawler_queue'), |
|
| 147 | 147 | array('process_id' => '') |
| 148 | 148 | ); |
| 149 | 149 | } |
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | $doProcessStillExists = false; |
| 178 | 178 | if (!$this->isOsWindows()) { |
| 179 | 179 | // Not windows |
| 180 | - if (file_exists('/proc/' . $pid)) { |
|
| 180 | + if (file_exists('/proc/'.$pid)) { |
|
| 181 | 181 | $doProcessStillExists = true; |
| 182 | 182 | } |
| 183 | 183 | } else { |
| 184 | 184 | // Windows |
| 185 | - exec('tasklist | find "' . $pid . '"', $returnArray, $returnValue); |
|
| 185 | + exec('tasklist | find "'.$pid.'"', $returnArray, $returnValue); |
|
| 186 | 186 | if (count($returnArray) > 0 && preg_match('/php/i', $returnValue[0])) { |
| 187 | 187 | $doProcessStillExists = true; |
| 188 | 188 | } |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | posix_kill($pid, 9); |
| 205 | 205 | } else { |
| 206 | 206 | // Windows |
| 207 | - exec('taskkill /PID ' . $pid); |
|
| 207 | + exec('taskkill /PID '.$pid); |
|
| 208 | 208 | } |
| 209 | 209 | } |
| 210 | 210 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $additionalParameters = array(); |
| 68 | 68 | $additionalParameters[] = 'SET[function]=tx_crawler_modfunc1'; |
| 69 | 69 | $additionalParameters[] = 'SET[crawlaction]=start'; |
| 70 | - $additionalParameters[] = 'configurationSelection[]=' . $crawlerConfiguration['name']; |
|
| 70 | + $additionalParameters[] = 'configurationSelection[]='.$crawlerConfiguration['name']; |
|
| 71 | 71 | |
| 72 | 72 | $additionalMenuItems = array(); |
| 73 | 73 | $additionalMenuItems[] = $backRef->linkItem( |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | 'crawler' |
| 77 | 77 | ), |
| 78 | 78 | $this->getContextMenuIcon(), |
| 79 | - 'top.goToModule(\'web_info\', 1, \'&' . implode('&', $additionalParameters) . '\'); return hideCM();' |
|
| 79 | + 'top.goToModule(\'web_info\', 1, \'&'.implode('&', $additionalParameters).'\'); return hideCM();' |
|
| 80 | 80 | ); |
| 81 | 81 | |
| 82 | 82 | return array_merge($menuItems, $additionalMenuItems); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $icon = sprintf( |
| 93 | 93 | '<img src="%s" border="0" align="top" alt="" />', |
| 94 | - ExtensionManagementUtility::extRelPath('crawler') . 'icon_tx_crawler_configuration.gif' |
|
| 94 | + ExtensionManagementUtility::extRelPath('crawler').'icon_tx_crawler_configuration.gif' |
|
| 95 | 95 | ); |
| 96 | 96 | |
| 97 | 97 | return $icon; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | public function execute() |
| 49 | 49 | { |
| 50 | 50 | $processManager = new \tx_crawler_domain_process_manager(); |
| 51 | - $timeout = is_int($this->timeOut) ? (int)$this->timeOut : 10000; |
|
| 51 | + $timeout = is_int($this->timeOut) ? (int) $this->timeOut : 10000; |
|
| 52 | 52 | |
| 53 | 53 | try { |
| 54 | 54 | $processManager->multiProcess($timeout); |
@@ -60,10 +60,10 @@ |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | $fieldId = 'mode'; |
| 63 | - $fieldCode = '<select name="tx_scheduler[mode]" id="' . $fieldId . '" value="' . htmlentities($taskInfo['mode']) . '">' |
|
| 64 | - . '<option value="all"' . ($taskInfo['mode'] == 'all' ? ' selected="selected"' : '') . '>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeAll') . '</option>' |
|
| 65 | - . '<option value="finished"' . ($taskInfo['mode'] == 'finished' ? ' selected="selected"' : '') . '>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeFinished') . '</option>' |
|
| 66 | - . '<option value="pending"' . ($taskInfo['mode'] == 'pending' ? ' selected="selected"' : '') . '>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modePending') . '</option>' |
|
| 63 | + $fieldCode = '<select name="tx_scheduler[mode]" id="'.$fieldId.'" value="'.htmlentities($taskInfo['mode']).'">' |
|
| 64 | + . '<option value="all"'.($taskInfo['mode'] == 'all' ? ' selected="selected"' : '').'>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeAll').'</option>' |
|
| 65 | + . '<option value="finished"'.($taskInfo['mode'] == 'finished' ? ' selected="selected"' : '').'>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeFinished').'</option>' |
|
| 66 | + . '<option value="pending"'.($taskInfo['mode'] == 'pending' ? ' selected="selected"' : '').'>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modePending').'</option>' |
|
| 67 | 67 | . '</select>'; |
| 68 | 68 | |
| 69 | 69 | $additionalFields[$fieldId] = array( |