@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | // Filter down to single month. |
| 92 | 92 | if (isset($year) && isset($monthNumber)) { |
| 93 | - $year = (int)$year; |
|
| 94 | - $monthNumber = (int)$monthNumber; |
|
| 93 | + $year = (int) $year; |
|
| 94 | + $monthNumber = (int) $monthNumber; |
|
| 95 | 95 | |
| 96 | 96 | $beginDate = sprintf("%04d-%02d-01 00:00:00", $year, $monthNumber); |
| 97 | 97 | $endDate = date('Y-m-d H:i:s', strtotime("{$beginDate} +1 month")); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | // Check if the currently processed month is the one that is selected via GET params. |
| 164 | 164 | $active = false; |
| 165 | 165 | if (isset($year) && isset($monthNumber)) { |
| 166 | - $active = (((int)$currentYear)==$year && ((int)$currentMonthNumber)==$monthNumber); |
|
| 166 | + $active = (((int) $currentYear) == $year && ((int) $currentMonthNumber) == $monthNumber); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | // Build the link - keep the tag and date filter, but reset the pagination. |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | public function getMetaTitle() { |
| 243 | 243 | $title = $this->data()->getTitle(); |
| 244 | 244 | $filter = $this->FilterDescription(); |
| 245 | - if($filter) { |
|
| 245 | + if ($filter) { |
|
| 246 | 246 | $title = "{$title} - {$filter}"; |
| 247 | 247 | } |
| 248 | 248 | |
@@ -313,13 +313,13 @@ discard block |
||
| 313 | 313 | $year = $this->request->getVar('year'); |
| 314 | 314 | $month = $this->request->getVar('month'); |
| 315 | 315 | |
| 316 | - if ($tag=='') $tag = null; |
|
| 317 | - if ($from=='') $from = null; |
|
| 318 | - if ($to=='') $to = null; |
|
| 319 | - if ($year=='') $year = null; |
|
| 320 | - if ($month=='') $month = null; |
|
| 316 | + if ($tag == '') $tag = null; |
|
| 317 | + if ($from == '') $from = null; |
|
| 318 | + if ($to == '') $to = null; |
|
| 319 | + if ($year == '') $year = null; |
|
| 320 | + if ($month == '') $month = null; |
|
| 321 | 321 | |
| 322 | - if (isset($tag)) $tag = (int)$tag; |
|
| 322 | + if (isset($tag)) $tag = (int) $tag; |
|
| 323 | 323 | if (isset($from)) { |
| 324 | 324 | $from = urldecode($from); |
| 325 | 325 | $parser = new SS_Datetime; |
@@ -332,8 +332,8 @@ discard block |
||
| 332 | 332 | $parser->setValue($to); |
| 333 | 333 | $to = $parser->Format('Y-m-d'); |
| 334 | 334 | } |
| 335 | - if (isset($year)) $year = (int)$year; |
|
| 336 | - if (isset($month)) $month = (int)$month; |
|
| 335 | + if (isset($year)) $year = (int) $year; |
|
| 336 | + if (isset($month)) $month = (int) $month; |
|
| 337 | 337 | |
| 338 | 338 | // If only "To" has been provided filter by single date. Normalise by swapping with "From". |
| 339 | 339 | if (isset($to) && !isset($from)) { |
@@ -341,13 +341,13 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | // Flip the dates if the order is wrong. |
| 344 | - if (isset($to) && isset($from) && strtotime($from)>strtotime($to)) { |
|
| 344 | + if (isset($to) && isset($from) && strtotime($from) > strtotime($to)) { |
|
| 345 | 345 | list($to, $from) = array($from, $to); |
| 346 | 346 | |
| 347 | 347 | if ($produceErrorMessages) { |
| 348 | 348 | Session::setFormMessage( |
| 349 | 349 | 'Form_DateRangeForm', |
| 350 | - _t('DateUpdateHolder.FilterAppliedMessage','Filter has been applied with the dates reversed.'), |
|
| 350 | + _t('DateUpdateHolder.FilterAppliedMessage', 'Filter has been applied with the dates reversed.'), |
|
| 351 | 351 | 'warning' |
| 352 | 352 | ); |
| 353 | 353 | } |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | if ($produceErrorMessages) { |
| 359 | 359 | Session::setFormMessage( |
| 360 | 360 | 'Form_DateRangeForm', |
| 361 | - _t('DateUpdateHolder.DateRangeFilterMessage','Filtered by a single date.'), |
|
| 361 | + _t('DateUpdateHolder.DateRangeFilterMessage', 'Filtered by a single date.'), |
|
| 362 | 362 | 'warning' |
| 363 | 363 | ); |
| 364 | 364 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | $tagID = $this->request->getVar('tag'); |
| 415 | 415 | |
| 416 | 416 | if (isset($tagID)) { |
| 417 | - return TaxonomyTerm::get_by_id('TaxonomyTerm', (int)$tagID); |
|
| 417 | + return TaxonomyTerm::get_by_id('TaxonomyTerm', (int) $tagID); |
|
| 418 | 418 | } |
| 419 | 419 | } |
| 420 | 420 | |
@@ -14,10 +14,10 @@ |
||
| 14 | 14 | private static $create_default_workflow = true; |
| 15 | 15 | |
| 16 | 16 | public function requireDefaultRecords() { |
| 17 | - if(Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) { |
|
| 17 | + if (Config::inst()->get('CwpWorkflowDefinitionExtension', 'create_default_workflow')) { |
|
| 18 | 18 | // Only proceed if a definition using this template has not been created yet |
| 19 | 19 | $definition = WorkflowDefinition::get()->filter("Template", "Review and Approve")->First(); |
| 20 | - if($definition && $definition->exists()) return; |
|
| 20 | + if ($definition && $definition->exists()) return; |
|
| 21 | 21 | |
| 22 | 22 | //generate from the template, which happens after we write the definition |
| 23 | 23 | $definition = WorkflowDefinition::create(); |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | * @return mixed |
| 26 | 26 | */ |
| 27 | 27 | public function php($data) { |
| 28 | - foreach($this->fieldNames as $fieldName) { |
|
| 29 | - if(empty($data[$fieldName])) { |
|
| 28 | + foreach ($this->fieldNames as $fieldName) { |
|
| 29 | + if (empty($data[$fieldName])) { |
|
| 30 | 30 | return; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param mixed $value |
| 42 | 42 | */ |
| 43 | 43 | protected function validateField($fieldName, $value) { |
| 44 | - if(!$this->validateValue($value)) { |
|
| 44 | + if (!$this->validateValue($value)) { |
|
| 45 | 45 | $this->validationError( |
| 46 | 46 | $fieldName, |
| 47 | 47 | _t( |
@@ -66,15 +66,15 @@ discard block |
||
| 66 | 66 | ); |
| 67 | 67 | |
| 68 | 68 | // strip comments (lines beginning with "#") |
| 69 | - $lines = array_filter($lines, function ($line) { |
|
| 69 | + $lines = array_filter($lines, function($line) { |
|
| 70 | 70 | $line = trim($line); |
| 71 | 71 | |
| 72 | 72 | return !empty($line) && $line[0] !== '#'; |
| 73 | 73 | }); |
| 74 | 74 | |
| 75 | 75 | // validate each line |
| 76 | - foreach($lines as $line) { |
|
| 77 | - if(!$this->validateLine($line)) { |
|
| 76 | + foreach ($lines as $line) { |
|
| 77 | + if (!$this->validateLine($line)) { |
|
| 78 | 78 | return false; |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | $parts = explode(',', $line); |
| 96 | 96 | $parts = array_filter($parts); |
| 97 | 97 | |
| 98 | - foreach($parts as $part) { |
|
| 99 | - if(!$this->validatePart($part)) { |
|
| 98 | + foreach ($parts as $part) { |
|
| 99 | + if (!$this->validatePart($part)) { |
|
| 100 | 100 | return false; |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -112,11 +112,11 @@ discard block |
||
| 112 | 112 | * @return bool |
| 113 | 113 | */ |
| 114 | 114 | protected function validatePart($part) { |
| 115 | - if(strpos($part, '=>') !== false) { |
|
| 115 | + if (strpos($part, '=>') !== false) { |
|
| 116 | 116 | $subs = explode('=>', $part); |
| 117 | 117 | $subs = array_filter($subs); |
| 118 | 118 | |
| 119 | - foreach($subs as $sub) { |
|
| 119 | + foreach ($subs as $sub) { |
|
| 120 | 120 | if (!$this->validateNoSpaces($sub)) { |
| 121 | 121 | return false; |
| 122 | 122 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $value = trim($value); |
| 139 | 139 | |
| 140 | 140 | // does the value contain 1 or more whitespace characters? |
| 141 | - if(preg_match('/\s+/', $value)) { |
|
| 141 | + if (preg_match('/\s+/', $value)) { |
|
| 142 | 142 | return false; |
| 143 | 143 | } |
| 144 | 144 | |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | public function updateCMSFields(FieldList $fields) { |
| 14 | 14 | // Don't show this field if you're not an admin |
| 15 | - if(!Permission::check('ADMIN')) { |
|
| 15 | + if (!Permission::check('ADMIN')) { |
|
| 16 | 16 | return; |
| 17 | 17 | } |
| 18 | 18 | |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | TextareaField::create('SearchSynonyms', _t('CwpConfig.SearchSynonyms', 'Search Synonyms')) |
| 23 | 23 | ->setDescription(_t( |
| 24 | 24 | 'CwpConfig.SearchSynonyms_Description', |
| 25 | - 'Enter as many comma separated synonyms as you wish, where '. |
|
| 25 | + 'Enter as many comma separated synonyms as you wish, where ' . |
|
| 26 | 26 | 'each line represents a group of synonyms.<br /> ' . |
| 27 | 27 | 'You will need to run <a rel="external" target="_blank" href="dev/tasks/Solr_Configure">Solr_Configure</a> if you make any changes' |
| 28 | 28 | )) |
@@ -54,11 +54,11 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function __construct($terms = '', ArrayData $results = null) { |
| 56 | 56 | $this->query = $terms; |
| 57 | - if($results) { |
|
| 57 | + if ($results) { |
|
| 58 | 58 | // Clean up the results. |
| 59 | 59 | $matches = $results->Matches; |
| 60 | - foreach($matches as $result) { |
|
| 61 | - if(!$result->canView()) { |
|
| 60 | + foreach ($matches as $result) { |
|
| 61 | + if (!$result->canView()) { |
|
| 62 | 62 | $matches->remove($result); |
| 63 | 63 | } |
| 64 | 64 | } |
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | * @return string|null |
| 178 | 178 | */ |
| 179 | 179 | protected function getLink($terms, $format = null) { |
| 180 | - if(!$terms) { |
|
| 180 | + if (!$terms) { |
|
| 181 | 181 | return null; |
| 182 | 182 | } |
| 183 | - $link = 'search/SearchForm?Search='.rawurlencode($terms); |
|
| 184 | - if($format) { |
|
| 185 | - $link .= '&format='.rawurlencode($format); |
|
| 183 | + $link = 'search/SearchForm?Search=' . rawurlencode($terms); |
|
| 184 | + if ($format) { |
|
| 185 | + $link .= '&format=' . rawurlencode($format); |
|
| 186 | 186 | } |
| 187 | 187 | return $link; |
| 188 | 188 | } |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | private static $hide_ancestor = 'CwpSearchPage'; |
| 9 | 9 | |
| 10 | 10 | public function canViewStage($stage = 'Live', $member = null) { |
| 11 | - if(Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) { |
|
| 11 | + if (Permission::checkMember($member, 'VIEW_DRAFT_CONTENT')) { |
|
| 12 | 12 | return true; |
| 13 | 13 | } |
| 14 | 14 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | public function __construct($dataRecord = null) { |
| 40 | - if(!$dataRecord) { |
|
| 40 | + if (!$dataRecord) { |
|
| 41 | 41 | $dataRecord = $this->generateSearchRecord(); |
| 42 | 42 | } |
| 43 | 43 | parent::__construct($dataRecord); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | protected function getSearchOptions($spellcheck) { |
| 60 | 60 | $options = $this->config()->search_options; |
| 61 | - if($spellcheck) { |
|
| 61 | + if ($spellcheck) { |
|
| 62 | 62 | $options = array_merge($options, $this->config()->spellcheck_options); |
| 63 | 63 | } |
| 64 | 64 | return $options; |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | * @return CwpSearchResult|null |
| 104 | 104 | */ |
| 105 | 105 | public function search($keywords, $classes, $searchIndex, $limit = -1, $start = 0, $followSuggestions = false) { |
| 106 | - if(empty($keywords)) { |
|
| 106 | + if (empty($keywords)) { |
|
| 107 | 107 | return null; |
| 108 | 108 | } |
| 109 | 109 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $result = $this->getResult($keywords, $classes, $searchIndex, $limit, $start, true); |
| 113 | 113 | |
| 114 | 114 | // Return results if we don't need to refine this any further |
| 115 | - if(!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) { |
|
| 115 | + if (!$followSuggestions || $result->hasResults() || !$result->getSuggestion()) { |
|
| 116 | 116 | return $result; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -122,13 +122,13 @@ discard block |
||
| 122 | 122 | $newResult->setOriginal($keywords); |
| 123 | 123 | |
| 124 | 124 | // Compare new results to the original query |
| 125 | - if($newResult->hasResults()) { |
|
| 125 | + if ($newResult->hasResults()) { |
|
| 126 | 126 | return $newResult; |
| 127 | 127 | } else { |
| 128 | 128 | return $result; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - } catch(Exception $e) { |
|
| 131 | + } catch (Exception $e) { |
|
| 132 | 132 | SS_Log::log($e, SS_Log::WARN); |
| 133 | 133 | } |
| 134 | 134 | |