@@ -16,7 +16,9 @@ discard block |
||
16 | 16 | private static $exclude_classes = array('RedirectorPage', 'VirtualPage'); |
17 | 17 | |
18 | 18 | public function index() { |
19 | - if (!Director::is_cli()) return 'Please run this controller in CLI'; |
|
19 | + if (!Director::is_cli()) { |
|
20 | + return 'Please run this controller in CLI'; |
|
21 | + } |
|
20 | 22 | |
21 | 23 | libxml_use_internal_errors(true); |
22 | 24 | set_time_limit(600); |
@@ -52,15 +54,23 @@ discard block |
||
52 | 54 | $exclude = Config::inst()->get($this->class, 'exclude_classes'); |
53 | 55 | $exclude = ($exclude) ? "'".implode("','", $exclude)."'" : ''; |
54 | 56 | foreach (SiteTree::get()->where("ClassName NOT IN($exclude)") as $page) { |
55 | - if (!$this->checkForPossibleLinks($page, $includeInFields)) continue; |
|
57 | + if (!$this->checkForPossibleLinks($page, $includeInFields)) { |
|
58 | + continue; |
|
59 | + } |
|
56 | 60 | $page = $this->getLinkData($page, $includeInFields); |
57 | - if (!$page) continue; |
|
61 | + if (!$page) { |
|
62 | + continue; |
|
63 | + } |
|
58 | 64 | |
59 | - if (!$run_in_realtime) AutomatedLinkPageResult::add_or_update($page); |
|
65 | + if (!$run_in_realtime) { |
|
66 | + AutomatedLinkPageResult::add_or_update($page); |
|
67 | + } |
|
60 | 68 | $data->push($page); |
61 | 69 | } |
62 | 70 | |
63 | - if (!$run_in_realtime) AutomatedLinkPageResult::remove_old_data(); |
|
71 | + if (!$run_in_realtime) { |
|
72 | + AutomatedLinkPageResult::remove_old_data(); |
|
73 | + } |
|
64 | 74 | |
65 | 75 | return $data; |
66 | 76 | } |
@@ -78,15 +88,18 @@ discard block |
||
78 | 88 | // Set a list of all fields that can have autolinks created in them |
79 | 89 | $page->AutomateableFields = ArrayList::create(); |
80 | 90 | |
81 | - foreach (AutomatedLink::getAllDatabaseFields($page->class) as $field => $type) |
|
82 | - if (in_array($field, $includeIn) && |
|
91 | + foreach (AutomatedLink::getAllDatabaseFields($page->class) as $field => $type) { |
|
92 | + if (in_array($field, $includeIn) && |
|
83 | 93 | !$page->AutomateableFields->find('DataField', $field) && |
84 | 94 | AutomatedLink::isFieldParsable($page, $field) |
85 | 95 | ) $page->AutomateableFields->push(DataObject::create(array('DataField' => $field))); |
96 | + } |
|
86 | 97 | |
87 | 98 | // Get data Pre-Automated Links creation |
88 | 99 | $withLinks = $this->getPageDOM($page); |
89 | - if (!$withLinks) return false; |
|
100 | + if (!$withLinks) { |
|
101 | + return false; |
|
102 | + } |
|
90 | 103 | |
91 | 104 | $links = $withLinks->getElementsByTagName('a'); |
92 | 105 | |
@@ -96,10 +109,11 @@ discard block |
||
96 | 109 | |
97 | 110 | // List all automated links that were created in this $page |
98 | 111 | $linksUsed = array(); |
99 | - foreach ($this->Links as $autolink) |
|
100 | - foreach ($links as $link) { |
|
112 | + foreach ($this->Links as $autolink) { |
|
113 | + foreach ($links as $link) { |
|
101 | 114 | if ($link->getAttribute('data-id') == $autolink->ID) { |
102 | 115 | $linksUsed[$autolink->ID] = $autolink->Phrase; |
116 | + } |
|
103 | 117 | $page->OriginalLinkCount--; |
104 | 118 | $page->LinkCount++; |
105 | 119 | } |
@@ -107,7 +121,9 @@ discard block |
||
107 | 121 | |
108 | 122 | $page->Links = implode(', ', $linksUsed); |
109 | 123 | |
110 | - if ($page->LinkCount < 1) return false; |
|
124 | + if ($page->LinkCount < 1) { |
|
125 | + return false; |
|
126 | + } |
|
111 | 127 | |
112 | 128 | return $page; |
113 | 129 | } |
@@ -122,8 +138,12 @@ discard block |
||
122 | 138 | */ |
123 | 139 | private function getPageDOM(SiteTree $page) { |
124 | 140 | $controllerClass = $page->class.'_Controller'; |
125 | - if (!class_exists($controllerClass)) $controllerClass = $page->class.'Controller'; |
|
126 | - if (!class_exists($controllerClass)) return false; |
|
141 | + if (!class_exists($controllerClass)) { |
|
142 | + $controllerClass = $page->class.'Controller'; |
|
143 | + } |
|
144 | + if (!class_exists($controllerClass)) { |
|
145 | + return false; |
|
146 | + } |
|
127 | 147 | |
128 | 148 | $controller = $controllerClass::create($page); |
129 | 149 | $controller->invokeWithExtensions('addAutomatedLinks'); |
@@ -154,9 +174,10 @@ discard block |
||
154 | 174 | * @return Boolean |
155 | 175 | */ |
156 | 176 | private function checkForPossibleLinks(SiteTree $page, array $includeIn) { |
157 | - foreach ($this->Links as $link) |
|
158 | - foreach ($includeIn as $possibleField) |
|
177 | + foreach ($this->Links as $link) { |
|
178 | + foreach ($includeIn as $possibleField) |
|
159 | 179 | if (isset($page->$possibleField) && preg_match("/\b{$link->Phrase}\b/i", $page->$possibleField)) return true; |
180 | + } |
|
160 | 181 | |
161 | 182 | return false; |
162 | 183 | } |