@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | // default to the binary being in the usual path on Linux |
| 4 | -if(!defined('WKHTMLTOPDF_BINARY')) { |
|
| 4 | +if (!defined('WKHTMLTOPDF_BINARY')) { |
|
| 5 | 5 | define('WKHTMLTOPDF_BINARY', '/usr/local/bin/wkhtmltopdf_12'); |
| 6 | 6 | } |
@@ -8,12 +8,12 @@ |
||
| 8 | 8 | |
| 9 | 9 | public function run($request) { |
| 10 | 10 | $path = sprintf('%s/%s', BASE_PATH, BasePage::config()->generated_pdf_path); |
| 11 | - if(!file_exists($path)) return false; |
|
| 11 | + if (!file_exists($path)) return false; |
|
| 12 | 12 | |
| 13 | 13 | exec(sprintf('if [ "$(ls -A %s 2> /dev/null)" != "" ]; then rm %s/*; fi', $path, $path), $output, $return_val); |
| 14 | 14 | |
| 15 | 15 | // output any errors |
| 16 | - if($return_val != 0) { |
|
| 16 | + if ($return_val != 0) { |
|
| 17 | 17 | user_error(sprintf('%s failed: ', get_class($this)) . implode("\n", $output), E_USER_ERROR); |
| 18 | 18 | } |
| 19 | 19 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $url = parse_url($this->ExternalLink); |
| 35 | 35 | |
| 36 | 36 | // if no scheme set in the link, default to http |
| 37 | - if(!isset($url['scheme'])) { |
|
| 37 | + if (!isset($url['scheme'])) { |
|
| 38 | 38 | return 'http://' . $this->ExternalLink; |
| 39 | 39 | } |
| 40 | 40 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $fields->removeByName('SortOrder'); |
| 73 | 73 | $externalLinkField->addExtraClass('noBorder'); |
| 74 | 74 | |
| 75 | - $fields->addFieldToTab('Root.Main',CompositeField::create( |
|
| 75 | + $fields->addFieldToTab('Root.Main', CompositeField::create( |
|
| 76 | 76 | array( |
| 77 | 77 | TreeDropdownField::create( |
| 78 | 78 | 'InternalLinkID', |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $wrap = CompositeField::create( |
| 84 | 84 | $extraLabel = LiteralField::create( |
| 85 | 85 | 'NoteOverride', |
| 86 | - _t('Quicklink.Note','<div class="message good notice">Note: If you specify an External Link, the Internal Link will be ignored.</div>') |
|
| 86 | + _t('Quicklink.Note', '<div class="message good notice">Note: If you specify an External Link, the Internal Link will be ignored.</div>') |
|
| 87 | 87 | ) |
| 88 | 88 | ) |
| 89 | 89 | ) |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | ); |
| 20 | 20 | |
| 21 | 21 | public function Page($link) { |
| 22 | - if($link instanceof SS_HTTPRequest) { |
|
| 22 | + if ($link instanceof SS_HTTPRequest) { |
|
| 23 | 23 | Deprecation::notice('2.0', 'Using page() as a url handler is deprecated. Use showpage() action instead'); |
| 24 | 24 | return $this->showpage($link); |
| 25 | 25 | } |
@@ -28,18 +28,18 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | public function showpage($request) { |
| 30 | 30 | $id = (int) $request->param('ID'); |
| 31 | - if(!$id) { |
|
| 31 | + if (!$id) { |
|
| 32 | 32 | return false; |
| 33 | 33 | } |
| 34 | 34 | $page = SiteTree::get()->byId($id); |
| 35 | 35 | |
| 36 | 36 | // does the page exist? |
| 37 | - if(!($page && $page->exists())) { |
|
| 37 | + if (!($page && $page->exists())) { |
|
| 38 | 38 | return $this->httpError(404); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | // can the page be viewed? |
| 42 | - if(!$page->canView()) { |
|
| 42 | + if (!$page->canView()) { |
|
| 43 | 43 | return $this->httpError(403); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | 'Children' => $page->Children() |
| 50 | 50 | )); |
| 51 | 51 | |
| 52 | - if($request->isAjax()) { |
|
| 52 | + if ($request->isAjax()) { |
|
| 53 | 53 | return $viewer->renderWith('SitemapNodeChildren'); |
| 54 | 54 | } else { |
| 55 | 55 | return $viewer; |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | private static $icon = 'cwp/images/icons/sitetree_images/event_holder.png'; |
| 16 | 16 | |
| 17 | - public $pageIcon = 'images/icons/sitetree_images/event_holder.png'; |
|
| 17 | + public $pageIcon = 'images/icons/sitetree_images/event_holder.png'; |
|
| 18 | 18 | |
| 19 | 19 | private static $singular_name = 'Event Holder'; |
| 20 | 20 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | public function getUpdateName() { |
| 59 | 59 | $params = $this->parseParams(); |
| 60 | 60 | if ($params['upcomingOnly']) { |
| 61 | - return _t('EventHolder.Upcoming','Upcoming events'); |
|
| 61 | + return _t('EventHolder.Upcoming', 'Upcoming events'); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | return 'Events'; |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | |
| 15 | 15 | private static $icon = 'cwp/images/icons/sitetree_images/news_listing.png'; |
| 16 | 16 | |
| 17 | - public $pageIcon = 'images/icons/sitetree_images/news_listing.png'; |
|
| 17 | + public $pageIcon = 'images/icons/sitetree_images/news_listing.png'; |
|
| 18 | 18 | |
| 19 | 19 | private static $singular_name = 'News Holder'; |
| 20 | 20 | |
@@ -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 | )) |