@@ -46,13 +46,13 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function modAction($mod_action) { |
48 | 48 | switch ($mod_action) { |
49 | - case 'ajax': |
|
50 | - header('Content-Type: text/html; charset=UTF-8'); |
|
51 | - echo $this->getSidebarAjaxContent(); |
|
52 | - break; |
|
53 | - default: |
|
54 | - http_response_code(404); |
|
55 | - break; |
|
49 | + case 'ajax': |
|
50 | + header('Content-Type: text/html; charset=UTF-8'); |
|
51 | + echo $this->getSidebarAjaxContent(); |
|
52 | + break; |
|
53 | + default: |
|
54 | + http_response_code(404); |
|
55 | + break; |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | |
@@ -150,18 +150,18 @@ discard block |
||
150 | 150 | $out = '<form method="post" action="module.php?mod=' . $this->getName() . '&mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="' . I18N::translate('Search') . '"><p>'; |
151 | 151 | foreach ($initials as $letter => $count) { |
152 | 152 | switch ($letter) { |
153 | - case '@': |
|
154 | - $html = I18N::translateContext('Unknown surname', '…'); |
|
155 | - break; |
|
156 | - case ',': |
|
157 | - $html = I18N::translate('None'); |
|
158 | - break; |
|
159 | - case ' ': |
|
160 | - $html = ' '; |
|
161 | - break; |
|
162 | - default: |
|
163 | - $html = $letter; |
|
164 | - break; |
|
153 | + case '@': |
|
154 | + $html = I18N::translateContext('Unknown surname', '…'); |
|
155 | + break; |
|
156 | + case ',': |
|
157 | + $html = I18N::translate('None'); |
|
158 | + break; |
|
159 | + case ' ': |
|
160 | + $html = ' '; |
|
161 | + break; |
|
162 | + default: |
|
163 | + $html = $letter; |
|
164 | + break; |
|
165 | 165 | } |
166 | 166 | $html = '<a href="module.php?mod=' . $this->getName() . '&mod_action=ajax&alpha=' . urlencode($letter) . '" class="sb_indi_letter">' . $html . '</a>'; |
167 | 167 | $out .= $html . " "; |
@@ -47,41 +47,41 @@ |
||
47 | 47 | */ |
48 | 48 | public function modAction($mod_action) { |
49 | 49 | switch ($mod_action) { |
50 | - case 'admin_config': |
|
51 | - $this->config(); |
|
52 | - break; |
|
53 | - case 'admin_delete': |
|
54 | - if (Auth::isAdmin()) { |
|
55 | - $this->delete(); |
|
56 | - } |
|
57 | - header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
58 | - break; |
|
59 | - case 'admin_edit': |
|
60 | - $this->edit(); |
|
61 | - break; |
|
62 | - case 'admin_edit_save': |
|
63 | - if (Auth::isAdmin()) { |
|
64 | - $this->editSave(); |
|
65 | - } |
|
66 | - header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
67 | - break; |
|
68 | - case 'admin_movedown': |
|
69 | - if (Auth::isAdmin()) { |
|
70 | - $this->movedown(); |
|
71 | - } |
|
72 | - header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
73 | - break; |
|
74 | - case 'admin_moveup': |
|
75 | - if (Auth::isAdmin()) { |
|
76 | - $this->moveup(); |
|
77 | - } |
|
78 | - header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
79 | - break; |
|
80 | - case 'show': |
|
81 | - $this->show(); |
|
82 | - break; |
|
83 | - default: |
|
84 | - http_response_code(404); |
|
50 | + case 'admin_config': |
|
51 | + $this->config(); |
|
52 | + break; |
|
53 | + case 'admin_delete': |
|
54 | + if (Auth::isAdmin()) { |
|
55 | + $this->delete(); |
|
56 | + } |
|
57 | + header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
58 | + break; |
|
59 | + case 'admin_edit': |
|
60 | + $this->edit(); |
|
61 | + break; |
|
62 | + case 'admin_edit_save': |
|
63 | + if (Auth::isAdmin()) { |
|
64 | + $this->editSave(); |
|
65 | + } |
|
66 | + header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
67 | + break; |
|
68 | + case 'admin_movedown': |
|
69 | + if (Auth::isAdmin()) { |
|
70 | + $this->movedown(); |
|
71 | + } |
|
72 | + header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
73 | + break; |
|
74 | + case 'admin_moveup': |
|
75 | + if (Auth::isAdmin()) { |
|
76 | + $this->moveup(); |
|
77 | + } |
|
78 | + header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config'); |
|
79 | + break; |
|
80 | + case 'show': |
|
81 | + $this->show(); |
|
82 | + break; |
|
83 | + default: |
|
84 | + http_response_code(404); |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 |
@@ -86,17 +86,17 @@ |
||
86 | 86 | */ |
87 | 87 | public static function showFact(Fact $fact) { |
88 | 88 | switch ($fact->getTag()) { |
89 | - case 'AFN': |
|
90 | - case 'CHAN': |
|
91 | - case 'IDNO': |
|
92 | - case 'REFN': |
|
93 | - case 'RFN': |
|
94 | - case 'RIN': |
|
95 | - case 'SSN': |
|
96 | - case '_UID': |
|
97 | - return true; |
|
98 | - default: |
|
99 | - return false; |
|
89 | + case 'AFN': |
|
90 | + case 'CHAN': |
|
91 | + case 'IDNO': |
|
92 | + case 'REFN': |
|
93 | + case 'RFN': |
|
94 | + case 'RIN': |
|
95 | + case 'SSN': |
|
96 | + case '_UID': |
|
97 | + return true; |
|
98 | + default: |
|
99 | + return false; |
|
100 | 100 | } |
101 | 101 | } |
102 | 102 | } |
@@ -190,18 +190,18 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | switch ($this->privatize_export) { |
193 | - case 'gedadmin': |
|
194 | - $access_level = Auth::PRIV_NONE; |
|
195 | - break; |
|
196 | - case 'user': |
|
197 | - $access_level = Auth::PRIV_USER; |
|
198 | - break; |
|
199 | - case 'visitor': |
|
200 | - $access_level = Auth::PRIV_PRIVATE; |
|
201 | - break; |
|
202 | - case 'none': |
|
203 | - $access_level = Auth::PRIV_HIDE; |
|
204 | - break; |
|
193 | + case 'gedadmin': |
|
194 | + $access_level = Auth::PRIV_NONE; |
|
195 | + break; |
|
196 | + case 'user': |
|
197 | + $access_level = Auth::PRIV_USER; |
|
198 | + break; |
|
199 | + case 'visitor': |
|
200 | + $access_level = Auth::PRIV_PRIVATE; |
|
201 | + break; |
|
202 | + case 'none': |
|
203 | + $access_level = Auth::PRIV_HIDE; |
|
204 | + break; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | foreach (array_keys($this->cart[$WT_TREE->getTreeId()]) as $xref) { |
@@ -234,38 +234,38 @@ discard block |
||
234 | 234 | $record = utf8_decode($record); |
235 | 235 | } |
236 | 236 | switch ($object::RECORD_TYPE) { |
237 | - case 'INDI': |
|
238 | - $filetext .= $record . "\n"; |
|
239 | - $filetext .= "1 SOUR @WEBTREES@\n"; |
|
240 | - $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n"; |
|
241 | - break; |
|
242 | - case 'FAM': |
|
243 | - $filetext .= $record . "\n"; |
|
244 | - $filetext .= "1 SOUR @WEBTREES@\n"; |
|
245 | - $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n"; |
|
246 | - break; |
|
247 | - case 'SOUR': |
|
248 | - $filetext .= $record . "\n"; |
|
249 | - $filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n"; |
|
250 | - break; |
|
251 | - default: |
|
252 | - // This autoloads the PclZip library, so we can use its constants. |
|
253 | - new PclZip(''); |
|
254 | - |
|
255 | - $ft = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER); |
|
256 | - $MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY'); |
|
257 | - for ($k = 0; $k < $ft; $k++) { |
|
258 | - // Skip external files and non-existant files |
|
259 | - if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) { |
|
260 | - $media[$mediacount] = array( |
|
261 | - \PCLZIP_ATT_FILE_NAME => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1], |
|
262 | - \PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1], |
|
263 | - ); |
|
264 | - $mediacount++; |
|
265 | - } |
|
266 | - } |
|
267 | - $filetext .= trim($record) . "\n"; |
|
268 | - break; |
|
237 | + case 'INDI': |
|
238 | + $filetext .= $record . "\n"; |
|
239 | + $filetext .= "1 SOUR @WEBTREES@\n"; |
|
240 | + $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n"; |
|
241 | + break; |
|
242 | + case 'FAM': |
|
243 | + $filetext .= $record . "\n"; |
|
244 | + $filetext .= "1 SOUR @WEBTREES@\n"; |
|
245 | + $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n"; |
|
246 | + break; |
|
247 | + case 'SOUR': |
|
248 | + $filetext .= $record . "\n"; |
|
249 | + $filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n"; |
|
250 | + break; |
|
251 | + default: |
|
252 | + // This autoloads the PclZip library, so we can use its constants. |
|
253 | + new PclZip(''); |
|
254 | + |
|
255 | + $ft = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER); |
|
256 | + $MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY'); |
|
257 | + for ($k = 0; $k < $ft; $k++) { |
|
258 | + // Skip external files and non-existant files |
|
259 | + if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) { |
|
260 | + $media[$mediacount] = array( |
|
261 | + \PCLZIP_ATT_FILE_NAME => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1], |
|
262 | + \PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1], |
|
263 | + ); |
|
264 | + $mediacount++; |
|
265 | + } |
|
266 | + } |
|
267 | + $filetext .= trim($record) . "\n"; |
|
268 | + break; |
|
269 | 269 | } |
270 | 270 | } |
271 | 271 | } |
@@ -452,22 +452,22 @@ discard block |
||
452 | 452 | $b = GedcomRecord::getInstance($b, $WT_TREE); |
453 | 453 | if ($a && $b) { |
454 | 454 | switch ($a::RECORD_TYPE) { |
455 | - case 'INDI': $t1 = 1; break; |
|
456 | - case 'FAM': $t1 = 2; break; |
|
457 | - case 'SOUR': $t1 = 3; break; |
|
458 | - case 'REPO': $t1 = 4; break; |
|
459 | - case 'OBJE': $t1 = 5; break; |
|
460 | - case 'NOTE': $t1 = 6; break; |
|
461 | - default: $t1 = 7; break; |
|
455 | + case 'INDI': $t1 = 1; break; |
|
456 | + case 'FAM': $t1 = 2; break; |
|
457 | + case 'SOUR': $t1 = 3; break; |
|
458 | + case 'REPO': $t1 = 4; break; |
|
459 | + case 'OBJE': $t1 = 5; break; |
|
460 | + case 'NOTE': $t1 = 6; break; |
|
461 | + default: $t1 = 7; break; |
|
462 | 462 | } |
463 | 463 | switch ($b::RECORD_TYPE) { |
464 | - case 'INDI': $t2 = 1; break; |
|
465 | - case 'FAM': $t2 = 2; break; |
|
466 | - case 'SOUR': $t2 = 3; break; |
|
467 | - case 'REPO': $t2 = 4; break; |
|
468 | - case 'OBJE': $t2 = 5; break; |
|
469 | - case 'NOTE': $t2 = 6; break; |
|
470 | - default: $t2 = 7; break; |
|
464 | + case 'INDI': $t2 = 1; break; |
|
465 | + case 'FAM': $t2 = 2; break; |
|
466 | + case 'SOUR': $t2 = 3; break; |
|
467 | + case 'REPO': $t2 = 4; break; |
|
468 | + case 'OBJE': $t2 = 5; break; |
|
469 | + case 'NOTE': $t2 = 6; break; |
|
470 | + default: $t2 = 7; break; |
|
471 | 471 | } |
472 | 472 | if ($t1 != $t2) { |
473 | 473 | return $t1 - $t2; |
@@ -83,16 +83,16 @@ |
||
83 | 83 | |
84 | 84 | $content = ''; |
85 | 85 | switch ($infoStyle) { |
86 | - case 'list': |
|
87 | - // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
88 | - $content .= FunctionsPrintLists::eventsList($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
89 | - break; |
|
90 | - case 'table': |
|
91 | - // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
92 | - ob_start(); |
|
93 | - $content .= FunctionsPrintLists::eventsTable($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
94 | - $content .= ob_get_clean(); |
|
95 | - break; |
|
86 | + case 'list': |
|
87 | + // Output style 1: Old format, no visible tables, much smaller text. Better suited to right side of page. |
|
88 | + $content .= FunctionsPrintLists::eventsList($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
89 | + break; |
|
90 | + case 'table': |
|
91 | + // Style 2: New format, tables, big text, etc. Not too good on right side of page |
|
92 | + ob_start(); |
|
93 | + $content .= FunctionsPrintLists::eventsTable($startjd, $endjd, $onlyBDM ? 'BIRT MARR DEAT' : '', $filter, $sortStyle); |
|
94 | + $content .= ob_get_clean(); |
|
95 | + break; |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | if ($template) { |
@@ -94,13 +94,13 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function modAction($mod_action) { |
96 | 96 | switch ($mod_action) { |
97 | - case 'admin_batch_update': |
|
98 | - echo $this->main(); |
|
99 | - break; |
|
97 | + case 'admin_batch_update': |
|
98 | + echo $this->main(); |
|
99 | + break; |
|
100 | 100 | |
101 | - default: |
|
102 | - http_response_code(404); |
|
103 | - break; |
|
101 | + default: |
|
102 | + http_response_code(404); |
|
103 | + break; |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | |
@@ -125,36 +125,36 @@ discard block |
||
125 | 125 | $this->getAllXrefs(); |
126 | 126 | |
127 | 127 | switch ($this->action) { |
128 | - case 'update': |
|
129 | - $record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]); |
|
130 | - if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) { |
|
131 | - $newrecord = $this->PLUGIN->updateRecord($this->xref, $record); |
|
132 | - if ($newrecord != $record) { |
|
133 | - if ($newrecord) { |
|
134 | - GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan); |
|
135 | - } else { |
|
136 | - GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord(); |
|
137 | - } |
|
138 | - } |
|
139 | - } |
|
140 | - $this->xref = $this->findNextXref($this->xref); |
|
141 | - break; |
|
142 | - case 'update_all': |
|
143 | - foreach ($this->all_xrefs as $xref => $type) { |
|
144 | - $record = self::getLatestRecord($xref, $type); |
|
145 | - if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) { |
|
146 | - $newrecord = $this->PLUGIN->updateRecord($xref, $record); |
|
147 | - if ($newrecord != $record) { |
|
148 | - if ($newrecord) { |
|
149 | - GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan); |
|
150 | - } else { |
|
151 | - GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord(); |
|
152 | - } |
|
153 | - } |
|
154 | - } |
|
155 | - } |
|
156 | - $this->xref = ''; |
|
157 | - break; |
|
128 | + case 'update': |
|
129 | + $record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]); |
|
130 | + if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) { |
|
131 | + $newrecord = $this->PLUGIN->updateRecord($this->xref, $record); |
|
132 | + if ($newrecord != $record) { |
|
133 | + if ($newrecord) { |
|
134 | + GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan); |
|
135 | + } else { |
|
136 | + GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord(); |
|
137 | + } |
|
138 | + } |
|
139 | + } |
|
140 | + $this->xref = $this->findNextXref($this->xref); |
|
141 | + break; |
|
142 | + case 'update_all': |
|
143 | + foreach ($this->all_xrefs as $xref => $type) { |
|
144 | + $record = self::getLatestRecord($xref, $type); |
|
145 | + if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) { |
|
146 | + $newrecord = $this->PLUGIN->updateRecord($xref, $record); |
|
147 | + if ($newrecord != $record) { |
|
148 | + if ($newrecord) { |
|
149 | + GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan); |
|
150 | + } else { |
|
151 | + GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord(); |
|
152 | + } |
|
153 | + } |
|
154 | + } |
|
155 | + } |
|
156 | + $this->xref = ''; |
|
157 | + break; |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | // Make sure that our requested record really does need updating. |
@@ -313,28 +313,28 @@ discard block |
||
313 | 313 | $vars = array(); |
314 | 314 | foreach ($this->PLUGIN->getRecordTypesToUpdate() as $type) { |
315 | 315 | switch ($type) { |
316 | - case 'INDI': |
|
317 | - $sql[] = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?"; |
|
318 | - $vars[] = $WT_TREE->getTreeId(); |
|
319 | - break; |
|
320 | - case 'FAM': |
|
321 | - $sql[] = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?"; |
|
322 | - $vars[] = $WT_TREE->getTreeId(); |
|
323 | - break; |
|
324 | - case 'SOUR': |
|
325 | - $sql[] = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?"; |
|
326 | - $vars[] = $WT_TREE->getTreeId(); |
|
327 | - break; |
|
328 | - case 'OBJE': |
|
329 | - $sql[] = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?"; |
|
330 | - $vars[] = $WT_TREE->getTreeId(); |
|
331 | - break; |
|
332 | - default: |
|
333 | - $sql[] = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?"; |
|
334 | - $vars[] = $type; |
|
335 | - $vars[] = $type; |
|
336 | - $vars[] = $WT_TREE->getTreeId(); |
|
337 | - break; |
|
316 | + case 'INDI': |
|
317 | + $sql[] = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?"; |
|
318 | + $vars[] = $WT_TREE->getTreeId(); |
|
319 | + break; |
|
320 | + case 'FAM': |
|
321 | + $sql[] = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?"; |
|
322 | + $vars[] = $WT_TREE->getTreeId(); |
|
323 | + break; |
|
324 | + case 'SOUR': |
|
325 | + $sql[] = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?"; |
|
326 | + $vars[] = $WT_TREE->getTreeId(); |
|
327 | + break; |
|
328 | + case 'OBJE': |
|
329 | + $sql[] = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?"; |
|
330 | + $vars[] = $WT_TREE->getTreeId(); |
|
331 | + break; |
|
332 | + default: |
|
333 | + $sql[] = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?"; |
|
334 | + $vars[] = $type; |
|
335 | + $vars[] = $type; |
|
336 | + $vars[] = $WT_TREE->getTreeId(); |
|
337 | + break; |
|
338 | 338 | } |
339 | 339 | } |
340 | 340 | $this->all_xrefs = |
@@ -411,20 +411,20 @@ discard block |
||
411 | 411 | global $WT_TREE; |
412 | 412 | |
413 | 413 | switch ($type) { |
414 | - case 'INDI': |
|
415 | - return Individual::getInstance($xref, $WT_TREE)->getGedcom(); |
|
416 | - case 'FAM': |
|
417 | - return Family::getInstance($xref, $WT_TREE)->getGedcom(); |
|
418 | - case 'SOUR': |
|
419 | - return Source::getInstance($xref, $WT_TREE)->getGedcom(); |
|
420 | - case 'REPO': |
|
421 | - return Repository::getInstance($xref, $WT_TREE)->getGedcom(); |
|
422 | - case 'OBJE': |
|
423 | - return Media::getInstance($xref, $WT_TREE)->getGedcom(); |
|
424 | - case 'NOTE': |
|
425 | - return Note::getInstance($xref, $WT_TREE)->getGedcom(); |
|
426 | - default: |
|
427 | - return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom(); |
|
414 | + case 'INDI': |
|
415 | + return Individual::getInstance($xref, $WT_TREE)->getGedcom(); |
|
416 | + case 'FAM': |
|
417 | + return Family::getInstance($xref, $WT_TREE)->getGedcom(); |
|
418 | + case 'SOUR': |
|
419 | + return Source::getInstance($xref, $WT_TREE)->getGedcom(); |
|
420 | + case 'REPO': |
|
421 | + return Repository::getInstance($xref, $WT_TREE)->getGedcom(); |
|
422 | + case 'OBJE': |
|
423 | + return Media::getInstance($xref, $WT_TREE)->getGedcom(); |
|
424 | + case 'NOTE': |
|
425 | + return Note::getInstance($xref, $WT_TREE)->getGedcom(); |
|
426 | + default: |
|
427 | + return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom(); |
|
428 | 428 | } |
429 | 429 | } |
430 | 430 |
@@ -74,15 +74,15 @@ |
||
74 | 74 | $married_names = array(); |
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(array('/ski$/', '/cki$/', '/dzki$/'), array('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(array('/ski$/', '/cki$/', '/dzki$/'), array('ska', 'cka', 'dzka'), $surname); |
|
83 | + } |
|
84 | + $married_names[] = "\n2 _MARNM " . preg_replace('!/.*/!', '/' . $surname . '/', $wife_name); |
|
85 | + break; |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 |
@@ -106,26 +106,26 @@ |
||
106 | 106 | |
107 | 107 | $this->error = ''; |
108 | 108 | switch ($this->method) { |
109 | - case 'exact': |
|
110 | - $this->regex = preg_quote($this->search, '/'); |
|
111 | - break; |
|
112 | - case 'words': |
|
113 | - $this->regex = '\b' . preg_quote($this->search, '/') . '\b'; |
|
114 | - break; |
|
115 | - case 'wildcards': |
|
116 | - $this->regex = '\b' . str_replace(array('\*', '\?'), array('.*', '.'), preg_quote($this->search, '/')) . '\b'; |
|
117 | - break; |
|
118 | - case 'regex': |
|
119 | - $this->regex = $this->search; |
|
120 | - // Check for invalid regular expressions. |
|
121 | - // A valid regex on a null string returns zero. |
|
122 | - // An invalid regex on a null string returns false and throws a warning. |
|
123 | - try { |
|
124 | - preg_match('/' . $this->search . '/', null); |
|
125 | - } catch (\ErrorException $ex) { |
|
126 | - $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>'; |
|
127 | - } |
|
128 | - break; |
|
109 | + case 'exact': |
|
110 | + $this->regex = preg_quote($this->search, '/'); |
|
111 | + break; |
|
112 | + case 'words': |
|
113 | + $this->regex = '\b' . preg_quote($this->search, '/') . '\b'; |
|
114 | + break; |
|
115 | + case 'wildcards': |
|
116 | + $this->regex = '\b' . str_replace(array('\*', '\?'), array('.*', '.'), preg_quote($this->search, '/')) . '\b'; |
|
117 | + break; |
|
118 | + case 'regex': |
|
119 | + $this->regex = $this->search; |
|
120 | + // Check for invalid regular expressions. |
|
121 | + // A valid regex on a null string returns zero. |
|
122 | + // An invalid regex on a null string returns false and throws a warning. |
|
123 | + try { |
|
124 | + preg_match('/' . $this->search . '/', null); |
|
125 | + } catch (\ErrorException $ex) { |
|
126 | + $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>'; |
|
127 | + } |
|
128 | + break; |
|
129 | 129 | } |
130 | 130 | } |
131 | 131 |
@@ -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 |