@@ -21,12 +21,12 @@ |
||
21 | 21 | <p>It seems we already have <?= ngettext('a definition', 'some definitions', $glossary->num_search_matches) ?> for that. Would you care to see <?= ngettext('it', 'them', $glossary->num_search_matches) ?>?</p> |
22 | 22 | <ul class="glossary"> |
23 | 23 | <?php |
24 | - foreach ($glossary->search_matches as $match) { |
|
25 | - $URL = new \MySociety\TheyWorkForYou\Url('glossary'); |
|
26 | - $URL->insert(['gl' => $match['glossary_id']]); |
|
27 | - $URL->remove(['g']); |
|
28 | - $term_link = $URL->generate('url'); |
|
29 | - ?> |
|
24 | + foreach ($glossary->search_matches as $match) { |
|
25 | + $URL = new \MySociety\TheyWorkForYou\Url('glossary'); |
|
26 | + $URL->insert(['gl' => $match['glossary_id']]); |
|
27 | + $URL->remove(['g']); |
|
28 | + $term_link = $URL->generate('url'); |
|
29 | + ?> |
|
30 | 30 | <li> |
31 | 31 | <a href="<?= $term_link ?>"><?= $match['title']?></a> |
32 | 32 | </li> |
@@ -5,11 +5,11 @@ discard block |
||
5 | 5 | namespace MySociety\TheyWorkForYou\GlossaryView; |
6 | 6 | |
7 | 7 | class AddTermView { |
8 | - public $glossary; |
|
8 | + public $glossary; |
|
9 | 9 | |
10 | - public function display(): array { |
|
10 | + public function display(): array { |
|
11 | 11 | if (!$this->has_access()) { |
12 | - return ['error' => _("You don't have permission to manage the glossary")]; |
|
12 | + return ['error' => _("You don't have permission to manage the glossary")]; |
|
13 | 13 | } |
14 | 14 | |
15 | 15 | $data = []; |
@@ -26,130 +26,130 @@ discard block |
||
26 | 26 | $data['glossary'] = $this->glossary; |
27 | 27 | |
28 | 28 | if (get_http_var('submitterm') != '') { |
29 | - $data = $this->add_glossary_entry($data); |
|
29 | + $data = $this->add_glossary_entry($data); |
|
30 | 30 | } elseif ((get_http_var('g') != '') && (get_http_var('previewterm') == '')) { |
31 | - $data = $this->check_glossary_entry($data); |
|
31 | + $data = $this->check_glossary_entry($data); |
|
32 | 32 | } elseif (get_http_var('previewterm') != '') { |
33 | - $data['definition'] = get_http_var('definition'); |
|
34 | - $data['preview'] = 1; |
|
33 | + $data['definition'] = get_http_var('definition'); |
|
34 | + $data['preview'] = 1; |
|
35 | 35 | } else { |
36 | - $data = $this->add_example_urls($data); |
|
36 | + $data = $this->add_example_urls($data); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | $URL = new \MySociety\TheyWorkForYou\Url('glossary_addterm'); |
40 | 40 | $data['form_url'] = $URL->generate(); |
41 | 41 | |
42 | 42 | return $data; |
43 | - } |
|
43 | + } |
|
44 | 44 | |
45 | - protected function has_access(): bool { |
|
45 | + protected function has_access(): bool { |
|
46 | 46 | global $THEUSER; |
47 | 47 | |
48 | 48 | if (!$THEUSER->is_able_to('addterm')) { |
49 | - return false; |
|
49 | + return false; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | return true; |
53 | - } |
|
53 | + } |
|
54 | 54 | |
55 | - protected function has_stop_words(): bool { |
|
55 | + protected function has_stop_words(): bool { |
|
56 | 56 | if (in_array($this->glossary->query, $this->glossary->stopwords)) { |
57 | - return true; |
|
57 | + return true; |
|
58 | 58 | } |
59 | 59 | return false; |
60 | - } |
|
60 | + } |
|
61 | 61 | |
62 | - protected function check_term_is_useful(array $data): array { |
|
62 | + protected function check_term_is_useful(array $data): array { |
|
63 | 63 | if ($this->has_stop_words()) { |
64 | - $data['error'] = 'Sorry, that phrase appears too many times to be a useful as a link within the parliamentary record.'; |
|
64 | + $data['error'] = 'Sorry, that phrase appears too many times to be a useful as a link within the parliamentary record.'; |
|
65 | 65 | } elseif (isset($data['appearances']) && !$data['appearances']) { |
66 | - $data['error'] = "Unfortunately <strong>" . $data['term'] . "</strong>, doesn't seem to appear in hansard at all...</p>"; |
|
66 | + $data['error'] = "Unfortunately <strong>" . $data['term'] . "</strong>, doesn't seem to appear in hansard at all...</p>"; |
|
67 | 67 | } elseif ($this->glossary->num_search_matches > 0) { |
68 | - $data['show_matches'] = 1; |
|
69 | - $data['error'] = 'Existing matches'; |
|
70 | - $data['count'] = $this->glossary->num_search_matches; |
|
68 | + $data['show_matches'] = 1; |
|
69 | + $data['error'] = 'Existing matches'; |
|
70 | + $data['count'] = $this->glossary->num_search_matches; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | return $data; |
74 | - } |
|
74 | + } |
|
75 | 75 | |
76 | - protected function get_appearance_count(string $term): int { |
|
76 | + protected function get_appearance_count(string $term): int { |
|
77 | 77 | global $SEARCHENGINE; |
78 | 78 | $SEARCHENGINE = new \SEARCHENGINE($term); |
79 | 79 | $count = $SEARCHENGINE->run_count(0, 10000); |
80 | 80 | return $count; |
81 | - } |
|
81 | + } |
|
82 | 82 | |
83 | - protected function check_glossary_entry(array $data): array { |
|
84 | - $data['appearances'] = $this->get_appearance_count($data['term']); |
|
85 | - $data['definition'] = ''; |
|
86 | - $data = $this->check_term_is_useful($data); |
|
83 | + protected function check_glossary_entry(array $data): array { |
|
84 | + $data['appearances'] = $this->get_appearance_count($data['term']); |
|
85 | + $data['definition'] = ''; |
|
86 | + $data = $this->check_term_is_useful($data); |
|
87 | 87 | |
88 | - if (!isset($data['error'])) { |
|
88 | + if (!isset($data['error'])) { |
|
89 | 89 | $data['definition'] = ''; |
90 | 90 | $list = new \HANSARDLIST(); |
91 | 91 | $examples = $list->display('search', [ |
92 | - 'num' => 5, |
|
93 | - 's' => $data['term'], |
|
94 | - 'view_override' => 'glossary_search', |
|
92 | + 'num' => 5, |
|
93 | + 's' => $data['term'], |
|
94 | + 'view_override' => 'glossary_search', |
|
95 | 95 | ], 'none'); |
96 | 96 | $data['examples'] = $examples['rows']; |
97 | - } |
|
97 | + } |
|
98 | 98 | |
99 | - return $data; |
|
100 | - } |
|
99 | + return $data; |
|
100 | + } |
|
101 | 101 | |
102 | - protected function add_glossary_entry(array $data): array { |
|
103 | - $data['submitted'] = 1; |
|
104 | - $data['body'] = get_http_var('definition'); |
|
105 | - $data = $this->check_term_is_useful($data); |
|
102 | + protected function add_glossary_entry(array $data): array { |
|
103 | + $data['submitted'] = 1; |
|
104 | + $data['body'] = get_http_var('definition'); |
|
105 | + $data = $this->check_term_is_useful($data); |
|
106 | 106 | |
107 | - $success = false; |
|
108 | - if (!isset($data['error'])) { |
|
107 | + $success = false; |
|
108 | + if (!isset($data['error'])) { |
|
109 | 109 | $entry = [ |
110 | - 'title' => $data['term'], |
|
111 | - 'body' => $data['body'], |
|
110 | + 'title' => $data['term'], |
|
111 | + 'body' => $data['body'], |
|
112 | 112 | ]; |
113 | 113 | $success = $this->glossary->create($data); |
114 | - } |
|
114 | + } |
|
115 | 115 | |
116 | - if (is_int($success)) { |
|
116 | + if (is_int($success)) { |
|
117 | 117 | $data['success'] = 1; |
118 | - } elseif (is_array($success)) { |
|
118 | + } elseif (is_array($success)) { |
|
119 | 119 | $data = array_merge($data, $success); |
120 | - } else { |
|
120 | + } else { |
|
121 | 121 | if (!isset($data['error'])) { |
122 | - $data['error'] = "Sorry, there was an error and we were unable to add your Glossary item."; |
|
122 | + $data['error'] = "Sorry, there was an error and we were unable to add your Glossary item."; |
|
123 | + } |
|
123 | 124 | } |
124 | - } |
|
125 | 125 | |
126 | - return $data; |
|
127 | - } |
|
126 | + return $data; |
|
127 | + } |
|
128 | 128 | |
129 | - protected function add_example_urls(array $data): array { |
|
129 | + protected function add_example_urls(array $data): array { |
|
130 | 130 | $URL = new \MySociety\TheyWorkForYou\Url('glossary'); |
131 | 131 | |
132 | 132 | $examples = [ |
133 | - 'technical' => [ |
|
133 | + 'technical' => [ |
|
134 | 134 | 'name' => 'Early Day Motion', 'id' => 90, |
135 | - ], |
|
136 | - 'organisation' => [ |
|
135 | + ], |
|
136 | + 'organisation' => [ |
|
137 | 137 | 'name' => 'Devon County Council', 'id' => 12, |
138 | - ], |
|
139 | - 'document' => [ |
|
138 | + ], |
|
139 | + 'document' => [ |
|
140 | 140 | 'name' => 'Hutton Report', 'id' => 7, |
141 | - ], |
|
141 | + ], |
|
142 | 142 | ]; |
143 | 143 | |
144 | 144 | $example_urls = []; |
145 | 145 | foreach ($examples as $name => $example) { |
146 | - $URL->insert(["gl" => $example['id']]); |
|
147 | - $example['url'] = $URL->generate(); |
|
148 | - $example_urls[$name] = $example; |
|
146 | + $URL->insert(["gl" => $example['id']]); |
|
147 | + $example['url'] = $URL->generate(); |
|
148 | + $example_urls[$name] = $example; |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | $data['example_urls'] = $example_urls; |
152 | 152 | return $data; |
153 | - } |
|
153 | + } |
|
154 | 154 | |
155 | 155 | } |