@@ -46,15 +46,15 @@ |
||
46 | 46 | */ |
47 | 47 | public function modAction($mod_action) { |
48 | 48 | switch ($mod_action) { |
49 | - case 'delete': |
|
50 | - $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id"); |
|
51 | - |
|
52 | - foreach (Filter::postArray('message_id') as $id) { |
|
53 | - $stmt->execute([ |
|
54 | - 'message_id' => $id, |
|
55 | - 'user_id' => Auth::id(), |
|
56 | - ]); |
|
57 | - } |
|
49 | + case 'delete': |
|
50 | + $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id"); |
|
51 | + |
|
52 | + foreach (Filter::postArray('message_id') as $id) { |
|
53 | + $stmt->execute([ |
|
54 | + 'message_id' => $id, |
|
55 | + 'user_id' => Auth::id(), |
|
56 | + ]); |
|
57 | + } |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | $ged = Filter::post('ged'); |
@@ -75,16 +75,16 @@ |
||
75 | 75 | |
76 | 76 | $content = ''; |
77 | 77 | switch ($infoStyle) { |
78 | - case 'list': |
|
79 | - // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
80 | - $content .= FunctionsPrintLists::eventsList($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
81 | - break; |
|
82 | - case 'table': |
|
83 | - // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
84 | - ob_start(); |
|
85 | - $content .= FunctionsPrintLists::eventsTable($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
86 | - $content .= ob_get_clean(); |
|
87 | - break; |
|
78 | + case 'list': |
|
79 | + // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
80 | + $content .= FunctionsPrintLists::eventsList($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
81 | + break; |
|
82 | + case 'table': |
|
83 | + // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
84 | + ob_start(); |
|
85 | + $content .= FunctionsPrintLists::eventsTable($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
86 | + $content .= ob_get_clean(); |
|
87 | + break; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | if ($template) { |
@@ -108,28 +108,28 @@ |
||
108 | 108 | |
109 | 109 | $this->error = ''; |
110 | 110 | switch ($this->method) { |
111 | - case 'exact': |
|
112 | - $this->regex = preg_quote($this->search, '/'); |
|
113 | - break; |
|
114 | - case 'words': |
|
115 | - $this->regex = '\b' . preg_quote($this->search, '/') . '\b'; |
|
116 | - break; |
|
117 | - case 'wildcards': |
|
118 | - $this->regex = '\b' . str_replace(['\*', '\?'], ['.*', '.'], preg_quote($this->search, '/')) . '\b'; |
|
119 | - break; |
|
120 | - case 'regex': |
|
121 | - $this->regex = $this->search; |
|
122 | - // Check for invalid regular expressions. |
|
123 | - // A valid regex on a null string returns zero. |
|
124 | - // An invalid regex on a null string returns false and throws a warning. |
|
125 | - try { |
|
126 | - preg_match('/' . $this->search . '/', null); |
|
127 | - } catch (\ErrorException $ex) { |
|
128 | - DebugBar::addThrowable($ex); |
|
129 | - |
|
130 | - $this->error = '<div class="alert alert-danger">' . /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('The regular expression appears to contain an error. It can’t be used.') . '</div>'; |
|
131 | - } |
|
132 | - break; |
|
111 | + case 'exact': |
|
112 | + $this->regex = preg_quote($this->search, '/'); |
|
113 | + break; |
|
114 | + case 'words': |
|
115 | + $this->regex = '\b' . preg_quote($this->search, '/') . '\b'; |
|
116 | + break; |
|
117 | + case 'wildcards': |
|
118 | + $this->regex = '\b' . str_replace(['\*', '\?'], ['.*', '.'], preg_quote($this->search, '/')) . '\b'; |
|
119 | + break; |
|
120 | + case 'regex': |
|
121 | + $this->regex = $this->search; |
|
122 | + // Check for invalid regular expressions. |
|
123 | + // A valid regex on a null string returns zero. |
|
124 | + // An invalid regex on a null string returns false and throws a warning. |
|
125 | + try { |
|
126 | + preg_match('/' . $this->search . '/', null); |
|
127 | + } catch (\ErrorException $ex) { |
|
128 | + DebugBar::addThrowable($ex); |
|
129 | + |
|
130 | + $this->error = '<div class="alert alert-danger">' . /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('The regular expression appears to contain an error. It can’t be used.') . '</div>'; |
|
131 | + } |
|
132 | + break; |
|
133 | 133 | } |
134 | 134 | } |
135 | 135 |
@@ -74,15 +74,15 @@ |
||
74 | 74 | $married_names = []; |
75 | 75 | foreach (self::surnamesToAdd($xref, $gedrec) as $surname) { |
76 | 76 | switch ($this->surname) { |
77 | - case 'add': |
|
78 | - $married_names[] = "\n2 _MARNM " . str_replace('/', '', $wife_name) . ' /' . $surname . '/'; |
|
79 | - break; |
|
80 | - case 'replace': |
|
81 | - if ($SURNAME_TRADITION === 'polish') { |
|
82 | - $surname = preg_replace(['/ski$/', '/cki$/', '/dzki$/'], ['ska', 'cka', 'dzka'], $surname); |
|
83 | - } |
|
84 | - $married_names[] = "\n2 _MARNM " . preg_replace('!/.*/!', '/' . $surname . '/', $wife_name); |
|
85 | - break; |
|
77 | + case 'add': |
|
78 | + $married_names[] = "\n2 _MARNM " . str_replace('/', '', $wife_name) . ' /' . $surname . '/'; |
|
79 | + break; |
|
80 | + case 'replace': |
|
81 | + if ($SURNAME_TRADITION === 'polish') { |
|
82 | + $surname = preg_replace(['/ski$/', '/cki$/', '/dzki$/'], ['ska', 'cka', 'dzka'], $surname); |
|
83 | + } |
|
84 | + $married_names[] = "\n2 _MARNM " . preg_replace('!/.*/!', '/' . $surname . '/', $wife_name); |
|
85 | + break; |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 |
@@ -101,14 +101,14 @@ |
||
101 | 101 | |
102 | 102 | foreach ($differences as $difference) { |
103 | 103 | switch ($difference[1]) { |
104 | - case MyersDiff::DELETE: |
|
105 | - $diff_lines[] = self::decorateDeletedText($difference[0]); |
|
106 | - break; |
|
107 | - case MyersDiff::INSERT: |
|
108 | - $diff_lines[] = self::decorateInsertedText($difference[0]); |
|
109 | - break; |
|
110 | - default: |
|
111 | - $diff_lines[] = $difference[0]; |
|
104 | + case MyersDiff::DELETE: |
|
105 | + $diff_lines[] = self::decorateDeletedText($difference[0]); |
|
106 | + break; |
|
107 | + case MyersDiff::INSERT: |
|
108 | + $diff_lines[] = self::decorateInsertedText($difference[0]); |
|
109 | + break; |
|
110 | + default: |
|
111 | + $diff_lines[] = $difference[0]; |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 |
@@ -68,16 +68,16 @@ |
||
68 | 68 | $tags = $filter ? 'BIRT MARR' : 'BIRT MARR DEAT'; |
69 | 69 | |
70 | 70 | switch ($infoStyle) { |
71 | - case 'list': |
|
72 | - // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
73 | - $content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle); |
|
74 | - break; |
|
75 | - case 'table': |
|
76 | - // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
77 | - ob_start(); |
|
78 | - $content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle); |
|
79 | - $content .= ob_get_clean(); |
|
80 | - break; |
|
71 | + case 'list': |
|
72 | + // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
73 | + $content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle); |
|
74 | + break; |
|
75 | + case 'table': |
|
76 | + // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
77 | + ob_start(); |
|
78 | + $content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle); |
|
79 | + $content .= ob_get_clean(); |
|
80 | + break; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | if ($template) { |
@@ -80,22 +80,22 @@ |
||
80 | 80 | global $WT_TREE; |
81 | 81 | |
82 | 82 | switch ($mod_action) { |
83 | - case 'menu-add-favorite': |
|
84 | - // Process the "add to user favorites" menu item on indi/fam/etc. pages |
|
85 | - $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE); |
|
86 | - if (Auth::check() && $record->canShowName()) { |
|
87 | - self::addFavorite([ |
|
88 | - 'user_id' => Auth::id(), |
|
89 | - 'gedcom_id' => $record->getTree()->getTreeId(), |
|
90 | - 'gid' => $record->getXref(), |
|
91 | - 'type' => $record::RECORD_TYPE, |
|
92 | - 'url' => null, |
|
93 | - 'note' => null, |
|
94 | - 'title' => null, |
|
95 | - ]); |
|
96 | - FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('“%s” has been added to your favorites.', $record->getFullName())); |
|
97 | - } |
|
98 | - break; |
|
83 | + case 'menu-add-favorite': |
|
84 | + // Process the "add to user favorites" menu item on indi/fam/etc. pages |
|
85 | + $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE); |
|
86 | + if (Auth::check() && $record->canShowName()) { |
|
87 | + self::addFavorite([ |
|
88 | + 'user_id' => Auth::id(), |
|
89 | + 'gedcom_id' => $record->getTree()->getTreeId(), |
|
90 | + 'gid' => $record->getXref(), |
|
91 | + 'type' => $record::RECORD_TYPE, |
|
92 | + 'url' => null, |
|
93 | + 'note' => null, |
|
94 | + 'title' => null, |
|
95 | + ]); |
|
96 | + FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('“%s” has been added to your favorites.', $record->getFullName())); |
|
97 | + } |
|
98 | + break; |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | } |
@@ -62,36 +62,36 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function modAction($mod_action) { |
64 | 64 | switch ($mod_action) { |
65 | - case 'ajax': |
|
66 | - $html = $this->getSidebarAjaxContent(); |
|
67 | - header('Content-Type: text/html; charset=UTF-8'); |
|
68 | - echo $html; |
|
69 | - break; |
|
70 | - case 'index': |
|
71 | - global $controller, $WT_TREE; |
|
72 | - |
|
73 | - $MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS'); |
|
74 | - |
|
75 | - $clip_ctrl = new ClippingsCartController; |
|
76 | - $cart = Session::get('cart'); |
|
77 | - |
|
78 | - $controller = new PageController; |
|
79 | - $controller |
|
80 | - ->setPageTitle($this->getTitle()) |
|
81 | - ->pageHeader(); |
|
82 | - |
|
83 | - echo '<script>'; |
|
84 | - echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}'; |
|
85 | - echo '</script>'; |
|
86 | - echo '<div class="clipping-cart">'; |
|
87 | - |
|
88 | - if (!$cart[$WT_TREE->getTreeId()]) { |
|
89 | - echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>'; |
|
90 | - } |
|
65 | + case 'ajax': |
|
66 | + $html = $this->getSidebarAjaxContent(); |
|
67 | + header('Content-Type: text/html; charset=UTF-8'); |
|
68 | + echo $html; |
|
69 | + break; |
|
70 | + case 'index': |
|
71 | + global $controller, $WT_TREE; |
|
72 | + |
|
73 | + $MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS'); |
|
74 | + |
|
75 | + $clip_ctrl = new ClippingsCartController; |
|
76 | + $cart = Session::get('cart'); |
|
77 | + |
|
78 | + $controller = new PageController; |
|
79 | + $controller |
|
80 | + ->setPageTitle($this->getTitle()) |
|
81 | + ->pageHeader(); |
|
82 | + |
|
83 | + echo '<script>'; |
|
84 | + echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}'; |
|
85 | + echo '</script>'; |
|
86 | + echo '<div class="clipping-cart">'; |
|
87 | + |
|
88 | + if (!$cart[$WT_TREE->getTreeId()]) { |
|
89 | + echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>'; |
|
90 | + } |
|
91 | 91 | |
92 | - if ($clip_ctrl->action == 'add') { |
|
93 | - $record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE); |
|
94 | - if ($clip_ctrl->type === 'FAM') { ?> |
|
92 | + if ($clip_ctrl->action == 'add') { |
|
93 | + $record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE); |
|
94 | + if ($clip_ctrl->type === 'FAM') { ?> |
|
95 | 95 | <form class="wt-page-options wt-page-options-clipping-cart hidden-print" action="module.php"> |
96 | 96 | <input type="hidden" name="mod" value="clippings"> |
97 | 97 | <input type="hidden" name="mod_action" value="index"> |
@@ -117,14 +117,14 @@ discard block |
||
117 | 117 | <td class="optionbox"> |
118 | 118 | <input type="radio" name="others" value="members" checked> |
119 | 119 | <?= /* I18N: %s is a family (husband + wife) */ |
120 | - I18N::translate('%s and their children', $record->getFullName()) ?> |
|
120 | + I18N::translate('%s and their children', $record->getFullName()) ?> |
|
121 | 121 | </td> |
122 | 122 | </tr> |
123 | 123 | <tr> |
124 | 124 | <td class="optionbox"> |
125 | 125 | <input type="radio" name="others" value="descendants"> |
126 | 126 | <?= /* I18N: %s is a family (husband + wife) */ |
127 | - I18N::translate('%s and their descendants', $record->getFullName()) ?> |
|
127 | + I18N::translate('%s and their descendants', $record->getFullName()) ?> |
|
128 | 128 | </td> |
129 | 129 | </tr> |
130 | 130 | </tbody> |
@@ -166,14 +166,14 @@ discard block |
||
166 | 166 | <label> |
167 | 167 | <input type="radio" name="others" value="parents"> |
168 | 168 | <?php |
169 | - if ($record->getSex() === 'F') { |
|
170 | - echo /* I18N: %s is a woman's name */ |
|
171 | - I18N::translate('%s, her parents and siblings', $record->getFullName()); |
|
172 | - } else { |
|
173 | - echo /* I18N: %s is a man's name */ |
|
174 | - I18N::translate('%s, his parents and siblings', $record->getFullName()); |
|
175 | - } |
|
176 | - ?> |
|
169 | + if ($record->getSex() === 'F') { |
|
170 | + echo /* I18N: %s is a woman's name */ |
|
171 | + I18N::translate('%s, her parents and siblings', $record->getFullName()); |
|
172 | + } else { |
|
173 | + echo /* I18N: %s is a man's name */ |
|
174 | + I18N::translate('%s, his parents and siblings', $record->getFullName()); |
|
175 | + } |
|
176 | + ?> |
|
177 | 177 | </label> |
178 | 178 | </td> |
179 | 179 | </tr> |
@@ -182,14 +182,14 @@ discard block |
||
182 | 182 | <label> |
183 | 183 | <input type="radio" name="others" value="members"> |
184 | 184 | <?php |
185 | - if ($record->getSex() === 'F') { |
|
186 | - echo /* I18N: %s is a woman's name */ |
|
187 | - I18N::translate('%s, her spouses and children', $record->getFullName()); |
|
188 | - } else { |
|
189 | - echo /* I18N: %s is a man's name */ |
|
190 | - I18N::translate('%s, his spouses and children', $record->getFullName()); |
|
191 | - } |
|
192 | - ?> |
|
185 | + if ($record->getSex() === 'F') { |
|
186 | + echo /* I18N: %s is a woman's name */ |
|
187 | + I18N::translate('%s, her spouses and children', $record->getFullName()); |
|
188 | + } else { |
|
189 | + echo /* I18N: %s is a man's name */ |
|
190 | + I18N::translate('%s, his spouses and children', $record->getFullName()); |
|
191 | + } |
|
192 | + ?> |
|
193 | 193 | </label> |
194 | 194 | </td> |
195 | 195 | </tr> |
@@ -198,18 +198,18 @@ discard block |
||
198 | 198 | <label> |
199 | 199 | <input type="radio" name="others" value="ancestors" id="ancestors"> |
200 | 200 | <?php |
201 | - if ($record->getSex() === 'F') { |
|
202 | - echo /* I18N: %s is a woman's name */ |
|
203 | - I18N::translate('%s and her ancestors', $record->getFullName()); |
|
204 | - } else { |
|
205 | - echo /* I18N: %s is a man's name */ |
|
206 | - I18N::translate('%s and his ancestors', $record->getFullName()); |
|
207 | - } |
|
208 | - ?> |
|
201 | + if ($record->getSex() === 'F') { |
|
202 | + echo /* I18N: %s is a woman's name */ |
|
203 | + I18N::translate('%s and her ancestors', $record->getFullName()); |
|
204 | + } else { |
|
205 | + echo /* I18N: %s is a man's name */ |
|
206 | + I18N::translate('%s and his ancestors', $record->getFullName()); |
|
207 | + } |
|
208 | + ?> |
|
209 | 209 | </label> |
210 | 210 | <br> |
211 | 211 | <?= I18N::translate('Number of generations') ?> |
212 | - <input type="text" size="5" name="level1" value="<?= $MAX_PEDIGREE_GENERATIONS ?>" onfocus="radAncestors('ancestors');"> |
|
212 | + <input type="text" size="5" name="level1" value="<?= $MAX_PEDIGREE_GENERATIONS ?>" onfocus="radAncestors('ancestors');"> |
|
213 | 213 | </td> |
214 | 214 | </tr> |
215 | 215 | <tr> |
@@ -217,18 +217,18 @@ discard block |
||
217 | 217 | <label> |
218 | 218 | <input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies"> |
219 | 219 | <?php |
220 | - if ($record->getSex() === 'F') { |
|
221 | - echo /* I18N: %s is a woman's name */ |
|
222 | - I18N::translate('%s, her ancestors and their families', $record->getFullName()); |
|
223 | - } else { |
|
224 | - echo /* I18N: %s is a man's name */ |
|
225 | - I18N::translate('%s, his ancestors and their families', $record->getFullName()); |
|
226 | - } |
|
227 | - ?> |
|
220 | + if ($record->getSex() === 'F') { |
|
221 | + echo /* I18N: %s is a woman's name */ |
|
222 | + I18N::translate('%s, her ancestors and their families', $record->getFullName()); |
|
223 | + } else { |
|
224 | + echo /* I18N: %s is a man's name */ |
|
225 | + I18N::translate('%s, his ancestors and their families', $record->getFullName()); |
|
226 | + } |
|
227 | + ?> |
|
228 | 228 | </label> |
229 | 229 | <br> |
230 | 230 | <?= I18N::translate('Number of generations') ?> |
231 | - <input type="text" size="5" name="level2" value="<?= $MAX_PEDIGREE_GENERATIONS ?>" onfocus="radAncestors('ancestorsfamilies');"> |
|
231 | + <input type="text" size="5" name="level2" value="<?= $MAX_PEDIGREE_GENERATIONS ?>" onfocus="radAncestors('ancestorsfamilies');"> |
|
232 | 232 | </td> |
233 | 233 | </tr> |
234 | 234 | <tr> |
@@ -236,18 +236,18 @@ discard block |
||
236 | 236 | <label> |
237 | 237 | <input type="radio" name="others" value="descendants" id="descendants"> |
238 | 238 | <?php |
239 | - if ($record->getSex() === 'F') { |
|
240 | - echo /* I18N: %s is a woman's name */ |
|
241 | - I18N::translate('%s, her spouses and descendants', $record->getFullName()); |
|
242 | - } else { |
|
243 | - echo /* I18N: %s is a man's name */ |
|
244 | - I18N::translate('%s, his spouses and descendants', $record->getFullName()); |
|
245 | - } |
|
246 | - ?> |
|
239 | + if ($record->getSex() === 'F') { |
|
240 | + echo /* I18N: %s is a woman's name */ |
|
241 | + I18N::translate('%s, her spouses and descendants', $record->getFullName()); |
|
242 | + } else { |
|
243 | + echo /* I18N: %s is a man's name */ |
|
244 | + I18N::translate('%s, his spouses and descendants', $record->getFullName()); |
|
245 | + } |
|
246 | + ?> |
|
247 | 247 | </label> |
248 | 248 | <br> |
249 | 249 | <?= I18N::translate('Number of generations') ?> |
250 | - <input type="text" size="5" name="level3" value="<?= $MAX_PEDIGREE_GENERATIONS ?>" onfocus="radAncestors('descendants');"> |
|
250 | + <input type="text" size="5" name="level3" value="<?= $MAX_PEDIGREE_GENERATIONS ?>" onfocus="radAncestors('descendants');"> |
|
251 | 251 | </td> |
252 | 252 | </tr> |
253 | 253 | </tbody> |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | <label> |
291 | 291 | <input type="radio" name="others" value="linked"> |
292 | 292 | <?= /* I18N: %s is the name of a source */ |
293 | - I18N::translate('%s and the individuals that reference it.', $record->getFullName()) ?> |
|
293 | + I18N::translate('%s and the individuals that reference it.', $record->getFullName()) ?> |
|
294 | 294 | </label> |
295 | 295 | </td> |
296 | 296 | </tr> |
@@ -306,14 +306,14 @@ discard block |
||
306 | 306 | </form> |
307 | 307 | </div> |
308 | 308 | <?php } |
309 | - } |
|
309 | + } |
|
310 | 310 | |
311 | - if (!$cart[$WT_TREE->getTreeId()]) { |
|
312 | - if ($clip_ctrl->action != 'add') { |
|
313 | - echo '<div class="center">'; |
|
314 | - echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.'); |
|
315 | - echo '</div>'; |
|
316 | - ?> |
|
311 | + if (!$cart[$WT_TREE->getTreeId()]) { |
|
312 | + if ($clip_ctrl->action != 'add') { |
|
313 | + echo '<div class="center">'; |
|
314 | + echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.'); |
|
315 | + echo '</div>'; |
|
316 | + ?> |
|
317 | 317 | <form class="wt-page-options wt-page-options-clipping-cart hidden-print" name="addin" action="module.php"> |
318 | 318 | <input type="hidden" name="mod" value="clippings"> |
319 | 319 | <input type="hidden" name="mod_action" value="index"> |
@@ -340,17 +340,17 @@ discard block |
||
340 | 340 | </form> |
341 | 341 | </div> |
342 | 342 | <?php |
343 | - } |
|
344 | - echo '<div class="center">'; |
|
345 | - // -- end new lines |
|
346 | - echo I18N::translate('Your clippings cart is empty.'); |
|
347 | - echo '</div>'; |
|
348 | - } else { |
|
349 | - // Keep track of the INDI from the parent page, otherwise it will |
|
350 | - // get lost after ajax updates |
|
351 | - $pid = Filter::get('pid', WT_REGEX_XREF); |
|
352 | - |
|
353 | - if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?> |
|
343 | + } |
|
344 | + echo '<div class="center">'; |
|
345 | + // -- end new lines |
|
346 | + echo I18N::translate('Your clippings cart is empty.'); |
|
347 | + echo '</div>'; |
|
348 | + } else { |
|
349 | + // Keep track of the INDI from the parent page, otherwise it will |
|
350 | + // get lost after ajax updates |
|
351 | + $pid = Filter::get('pid', WT_REGEX_XREF); |
|
352 | + |
|
353 | + if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?> |
|
354 | 354 | <form class="wt-page-options wt-page-options-clipping-cart hidden-print" action="module.php"> |
355 | 355 | <input type="hidden" name="mod" value="clippings"> |
356 | 356 | <input type="hidden" name="mod_action" value="index"> |
@@ -460,32 +460,32 @@ discard block |
||
460 | 460 | </thead> |
461 | 461 | <tbody> |
462 | 462 | <?php |
463 | - foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) { |
|
464 | - $record = GedcomRecord::getInstance($xref, $WT_TREE); |
|
465 | - if ($record) { |
|
466 | - switch ($record::RECORD_TYPE) { |
|
467 | - case 'INDI': |
|
468 | - $icon = 'icon-indis'; |
|
469 | - break; |
|
470 | - case 'FAM': |
|
471 | - $icon = 'icon-sfamily'; |
|
472 | - break; |
|
473 | - case 'SOUR': |
|
474 | - $icon = 'icon-source'; |
|
475 | - break; |
|
476 | - case 'REPO': |
|
477 | - $icon = 'icon-repository'; |
|
478 | - break; |
|
479 | - case 'NOTE': |
|
480 | - $icon = 'icon-note'; |
|
481 | - break; |
|
482 | - case 'OBJE': |
|
483 | - $icon = 'icon-media'; |
|
484 | - break; |
|
485 | - default: |
|
486 | - $icon = 'icon-clippings'; |
|
487 | - break; |
|
488 | - } |
|
463 | + foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) { |
|
464 | + $record = GedcomRecord::getInstance($xref, $WT_TREE); |
|
465 | + if ($record) { |
|
466 | + switch ($record::RECORD_TYPE) { |
|
467 | + case 'INDI': |
|
468 | + $icon = 'icon-indis'; |
|
469 | + break; |
|
470 | + case 'FAM': |
|
471 | + $icon = 'icon-sfamily'; |
|
472 | + break; |
|
473 | + case 'SOUR': |
|
474 | + $icon = 'icon-source'; |
|
475 | + break; |
|
476 | + case 'REPO': |
|
477 | + $icon = 'icon-repository'; |
|
478 | + break; |
|
479 | + case 'NOTE': |
|
480 | + $icon = 'icon-note'; |
|
481 | + break; |
|
482 | + case 'OBJE': |
|
483 | + $icon = 'icon-media'; |
|
484 | + break; |
|
485 | + default: |
|
486 | + $icon = 'icon-clippings'; |
|
487 | + break; |
|
488 | + } |
|
489 | 489 | ?> |
490 | 490 | <tr> |
491 | 491 | <td class="list_value"> |
@@ -505,9 +505,9 @@ discard block |
||
505 | 505 | <?php |
506 | 506 | } |
507 | 507 | break; |
508 | - default: |
|
509 | - http_response_code(404); |
|
510 | - break; |
|
508 | + default: |
|
509 | + http_response_code(404); |
|
510 | + break; |
|
511 | 511 | } |
512 | 512 | } |
513 | 513 | |
@@ -667,12 +667,12 @@ discard block |
||
667 | 667 | $record = GedcomRecord::getInstance($xref, $WT_TREE); |
668 | 668 | if ($record instanceof Individual || $record instanceof Family) { |
669 | 669 | switch ($record::RECORD_TYPE) { |
670 | - case 'INDI': |
|
671 | - $icon = 'icon-indis'; |
|
672 | - break; |
|
673 | - case 'FAM': |
|
674 | - $icon = 'icon-sfamily'; |
|
675 | - break; |
|
670 | + case 'INDI': |
|
671 | + $icon = 'icon-indis'; |
|
672 | + break; |
|
673 | + case 'FAM': |
|
674 | + $icon = 'icon-sfamily'; |
|
675 | + break; |
|
676 | 676 | } |
677 | 677 | $out .= '<li>'; |
678 | 678 | if (!empty($icon)) { |
@@ -61,23 +61,23 @@ |
||
61 | 61 | $stats = new Stats($WT_TREE); |
62 | 62 | |
63 | 63 | switch ($infoStyle) { |
64 | - case 'list': |
|
65 | - $males = $stats->commonGivenMaleTotals([1, $num, 'rcount']); |
|
66 | - $females = $stats->commonGivenFemaleTotals([1, $num, 'rcount']); |
|
67 | - $content = View::make('blocks/top-given-names-list', [ |
|
68 | - 'males' => $males, |
|
69 | - 'females' => $females, |
|
70 | - ]); |
|
71 | - break; |
|
72 | - default: |
|
73 | - case 'table': |
|
74 | - $males = $stats->commonGivenMaleTable([1, $num, 'rcount']); |
|
75 | - $females = $stats->commonGivenFemaleTable([1, $num, 'rcount']); |
|
76 | - $content = View::make('blocks/top-given-names-table', [ |
|
77 | - 'males' => $males, |
|
78 | - 'females' => $females, |
|
79 | - ]); |
|
80 | - break; |
|
64 | + case 'list': |
|
65 | + $males = $stats->commonGivenMaleTotals([1, $num, 'rcount']); |
|
66 | + $females = $stats->commonGivenFemaleTotals([1, $num, 'rcount']); |
|
67 | + $content = View::make('blocks/top-given-names-list', [ |
|
68 | + 'males' => $males, |
|
69 | + 'females' => $females, |
|
70 | + ]); |
|
71 | + break; |
|
72 | + default: |
|
73 | + case 'table': |
|
74 | + $males = $stats->commonGivenMaleTable([1, $num, 'rcount']); |
|
75 | + $females = $stats->commonGivenFemaleTable([1, $num, 'rcount']); |
|
76 | + $content = View::make('blocks/top-given-names-table', [ |
|
77 | + 'males' => $males, |
|
78 | + 'females' => $females, |
|
79 | + ]); |
|
80 | + break; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | if ($template) { |