fisharebest / webtrees

placelist.php

Braces +3 added lines, -1 removed lines

@@ -200,7 +200,8 @@ 
 			<div class="tab-pane fade show active" role="tabpanel" id="individuals">
 				<?php if (empty($myindilist)): ?>
 					<p><?= I18N::translate('No results found.') ?></p>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= FunctionsPrintLists::individualTable($myindilist) ?>
 				<?php endif ?>
 			</div>
@@ -216,6 +217,7 @@ 
 		<?php
 	}
 	echo '<h4><a href="placelist.php?display=list">', I18N::translate('Show all places in a list'), '</a></h4>';
+}
 
 	if ($gm_module && $gm_module->getPreference('GM_PLACE_HIERARCHY')) {
 		$gm_module->mapScripts($numfound, $level, $parent, $linklevels, $place_names);

admin_trees_config.php

Spacing +1 added lines, -1 removed lines

@@ -1505,7 +1505,7 @@
 						'0' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'first'),
 						'1' => I18N::translateContext('Show the [first/last] [N] parts of a place name.', 'last'),
 					], $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES_SUFFIX', ['name' => 'SHOW_PEDIGREE_PLACES_SUFFIX'])),
-					Bootstrap4::select(FunctionsEdit::numericOptions(range(1,9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
+					Bootstrap4::select(FunctionsEdit::numericOptions(range(1, 9)), $WT_TREE->getPreference('SHOW_PEDIGREE_PLACES'), ['name' => 'SHOW_PEDIGREE_PLACES'])
 				) ?>
 				<p class="small text-muted">
 					<?= /* I18N: Help text for the “Abbreviate place names” configuration setting */ I18N::translate('Place names are frequently too long to fit on charts, lists, etc. They can be abbreviated by showing just the first few parts of the name, such as <i>village, county</i>, or the last few part of it, such as <i>region, country</i>.') ?>

app/Module.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 					}
 				} catch (\Exception $ex) {
 					// The module has been deleted or is broken? Disable it.
-					Log::addConfigurationLog("Module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
+					Log::addConfigurationLog("module {$module_name} is missing or broken - disabling it. " . $ex->getMessage());
 					Database::prepare(
 						"UPDATE `##module` SET status = 'disabled' WHERE module_name = :module_name"
 					)->execute([

app/Controller/IndividualController.php

Doc Comments -2 removed lines

@@ -118,7 +118,6 @@ 
 	/**
 	 * Format a name record
 	 *
-	 * @param int  $primary
 	 * @param Fact $fact
 	 *
 	 * @return string
@@ -216,7 +215,6 @@ 
 	/**
 	 * print information for a sex record
 	 *
-	 * @param Fact $event the Event object
 	 *
 	 * @return string
 	 */

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	public function getTabs() {
 		$active_tabs = Module::getActiveTabs($this->record->getTree());
 
-		return array_filter($active_tabs, function(ModuleTabInterface $tab) { return $tab->hasTabContent(); });
+		return array_filter($active_tabs, function (ModuleTabInterface $tab) { return $tab->hasTabContent(); });
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 
 		if ($n === 0) {
 			$content_class = 'collapse show';
-			$aria  = 'true';
+			$aria = 'true';
 		}
 		if ($fact->isPendingDeletion()) {
 			$container_class .= ' old';
@@ -243,7 +243,7 @@ 
 		}
 
 		if ($individual->canEdit() && !$fact->isPendingDeletion()) {
-			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml() ]);
+			$edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $individual->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $individual->getTree()->getNameHtml()]);
 
 		} else {
 			$edit_links = '';
@@ -253,7 +253,7 @@ 
 		<div class="' . $container_class . '">
 			<div class="card-header" role="tab" id="name-header-add">
 				<div class="card-title mb-0">
-					<b>' . I18N::translate('Gender') . '</b> ' .  $sex . $edit_links . '
+					<b>' . I18N::translate('Gender') . '</b> ' . $sex . $edit_links . '
 				</div>
 			</div>
 		</div>';

relationship.php

Braces +3 added lines, -1 removed lines

@@ -82,7 +82,8 @@ 
 				<?php if ($ancestors_only === '1'): ?>
 					<input type="hidden" name="ancestors" value="1">
 					<?= I18N::translate('Find relationships via ancestors') ?>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= Bootstrap4::radioButtons('ancestors', ['0' => I18N::translate('Find any relationship'), '1' => I18N::translate('Find relationships via ancestors')], $ancestors, false) ?>
 			<?php endif ?>
 			</div>
@@ -115,6 +116,7 @@ 
 if ($person1 && $person2) {
 	if (I18N::direction() === 'ltr') {
 		$diagonal1        = Theme::theme()->parameter('image-dline');
+}
 		$diagonal2        = Theme::theme()->parameter('image-dline2');
 	} else {
 		$diagonal1        = Theme::theme()->parameter('image-dline2');

app/Select2.php

Spacing +3 added lines, -3 removed lines

@@ -176,7 +176,7 @@ 
 
 		$flag_files = [];
 		foreach ($it as $file) {
-			$file_path = substr($file->getPathname() , strlen($directory));
+			$file_path = substr($file->getPathname(), strlen($directory));
 			if ($file->getExtension() === 'png' && stripos($file_path, $query) !== false) {
 				if ($offset > 0) {
 					// Skip results
@@ -453,7 +453,7 @@ 
 			if ($place_name === $query) {
 				$found = true;
 			}
-			$results[]  = [
+			$results[] = [
 				'id'   => $place_name,
 				'text' => $place_name,
 			];
@@ -488,7 +488,7 @@ 
 					if ($place_name === $query) {
 						$found = true;
 					}
-					$results[]  = [
+					$results[] = [
 						'id'   => $place_name,
 						'text' => $place_name,
 					];

app/Filter.php

Doc Comments +1 added lines, -1 removed lines

@@ -334,7 +334,7 @@
 	 * @param string|null $regexp
 	 * @param string      $default
 	 *
-	 * @return string[]|string[][]
+	 * @return string[]
 	 */
 	public static function postArray($variable, $regexp = null, $default = '') {
 		return self::inputArray(INPUT_POST, $variable, $regexp, $default);

app/Module/CensusAssistantModule.php

Doc Comments +1 added lines, -2 removed lines

@@ -84,7 +84,6 @@ 
 
     /**
      * @param Individual      $individual
-     * @param CensusInterface $census
      */
     public function createCensusAssistant(Individual $individual) {
         ?>
@@ -287,7 +286,7 @@ 
      * @param string          $ca_title
      * @param string          $ca_place
      * @param string          $ca_citation
-     * @param string[][]      $ca_individuals
+     * @param string[]      $ca_individuals
      * @param string          $ca_notes
      *
      * @return string

Unused Use Statements -2 removed lines

@@ -21,13 +21,11 @@
 use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Filter;
 use Fisharebest\Webtrees\FontAwesome;
-use Fisharebest\Webtrees\Functions\Functions;
 use Fisharebest\Webtrees\Functions\FunctionsDb;
 use Fisharebest\Webtrees\Functions\FunctionsEdit;
 use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Menu;
 use Fisharebest\Webtrees\Note;
 use Fisharebest\Webtrees\Soundex;
 

Indentation +333 added lines, -333 removed lines

@@ -35,59 +35,59 @@ 
  * Class CensusAssistantModule
  */
 class CensusAssistantModule extends AbstractModule {
-    /** {@inheritdoc} */
-    public function getTitle() {
-        return /* I18N: Name of a module */
-            I18N::translate('Census assistant');
-    }
-
-    /** {@inheritdoc} */
-    public function getDescription() {
-        return /* I18N: Description of the “Census assistant” module */
-            I18N::translate('An alternative way to enter census transcripts and link them to individuals.');
-    }
-
-    /**
-     * This is a general purpose hook, allowing modules to respond to routes
-     * of the form module.php?mod=FOO&mod_action=BAR
-     *
-     * @param string $mod_action
-     */
-    public function modAction($mod_action) {
-        global $WT_TREE;
-
-        switch ($mod_action) {
-        case 'census-header':
-            header('Content-Type: text/html; charset=utf8');
-            $census = Filter::get('census');
-            echo $this->censusTableHeader(new $census);
-            break;
-
-        case 'census-individual':
-            header('Content-Type: text/html; charset=utf8');
-            $census     = Filter::get('census');
-            $individual = Individual::getInstance(Filter::get('xref'), $WT_TREE);
-            $head       = Individual::getInstance(Filter::get('head'), $WT_TREE);
-            echo $this->censusTableRow(new $census, $individual, $head);
-            break;
-
-        case 'media_find':
-            self::mediaFind();
-            break;
-        case 'media_query_3a':
-            self::mediaQuery();
-            break;
-        default:
-            http_response_code(404);
-        }
-    }
-
-    /**
-     * @param Individual      $individual
-     * @param CensusInterface $census
-     */
-    public function createCensusAssistant(Individual $individual) {
-        ?>
+		/** {@inheritdoc} */
+		public function getTitle() {
+				return /* I18N: Name of a module */
+						I18N::translate('Census assistant');
+		}
+
+		/** {@inheritdoc} */
+		public function getDescription() {
+				return /* I18N: Description of the “Census assistant” module */
+						I18N::translate('An alternative way to enter census transcripts and link them to individuals.');
+		}
+
+		/**
+		 * This is a general purpose hook, allowing modules to respond to routes
+		 * of the form module.php?mod=FOO&mod_action=BAR
+		 *
+		 * @param string $mod_action
+		 */
+		public function modAction($mod_action) {
+				global $WT_TREE;
+
+				switch ($mod_action) {
+				case 'census-header':
+						header('Content-Type: text/html; charset=utf8');
+						$census = Filter::get('census');
+						echo $this->censusTableHeader(new $census);
+						break;
+
+				case 'census-individual':
+						header('Content-Type: text/html; charset=utf8');
+						$census     = Filter::get('census');
+						$individual = Individual::getInstance(Filter::get('xref'), $WT_TREE);
+						$head       = Individual::getInstance(Filter::get('head'), $WT_TREE);
+						echo $this->censusTableRow(new $census, $individual, $head);
+						break;
+
+				case 'media_find':
+						self::mediaFind();
+						break;
+				case 'media_query_3a':
+						self::mediaQuery();
+						break;
+				default:
+						http_response_code(404);
+				}
+		}
+
+		/**
+		 * @param Individual      $individual
+		 * @param CensusInterface $census
+		 */
+		public function createCensusAssistant(Individual $individual) {
+				?>
 
         <div id="census-assistant-link" hidden>
             <a href="#">
@@ -245,85 +245,85 @@ 
             document.querySelector('#census-assistant-head').addEventListener('click', censusAssistantHead);
         </script>
         <?php
-    }
-
-    /**
-     * @param Individual $individual
-     * @param string     $newged
-     *
-     * @return string
-     */
-    public function updateCensusAssistant(Individual $individual, $fact_id, $newged, $keep_chan) {
-        $ca_title       = Filter::post('ca_title');
-        $ca_place       = Filter::post('ca_place');
-        $ca_citation    = Filter::post('ca_citation');
-        $ca_individuals = Filter::postArray('ca_individuals');
-        $ca_notes       = Filter::post('ca_notes');
-        $ca_census      = Filter::post('ca_census', 'Fisharebest\\\\Webtrees\\\\Census\\\\CensusOf[A-Za-z0-9]+');
-
-        if ($ca_census !== '' && !empty($ca_individuals)) {
-            $census = new $ca_census;
-
-            $note_text   = $this->createNoteText($census, $ca_title, $ca_place, $ca_citation, $ca_individuals, $ca_notes);
-            $note_gedcom = '0 @new@ NOTE ' . str_replace("\n", "\n1 CONT ", $note_text);
-            $note        = $individual->getTree()->createRecord($note_gedcom);
-
-            $newged .= "\n2 NOTE @" . $note->getXref() . '@';
-
-            // Add the census fact to the rest of the household
-            foreach (array_keys($ca_individuals) as $xref) {
-                if ($xref !== $individual->getXref()) {
-                    Individual::getInstance($xref, $individual->getTree())
-                        ->updateFact($fact_id, $newged, !$keep_chan);
-                }
-            }
-        }
-
-        return $newged;
-    }
-
-    /**
-     * @param CensusInterface $census
-     * @param string          $ca_title
-     * @param string          $ca_place
-     * @param string          $ca_citation
-     * @param string[][]      $ca_individuals
-     * @param string          $ca_notes
-     *
-     * @return string
-     */
-    private function createNoteText(CensusInterface $census, $ca_title, $ca_place, $ca_citation, $ca_individuals, $ca_notes) {
-        $text = $ca_title . "\n" . $ca_citation . "\n" . $ca_place . "\n\n.start_formatted_area.\n\n";
-
-        foreach ($census->columns() as $n => $column) {
-            if ($n > 0) {
-                $text .= '|';
-            }
-            $text .= '.b.' . $column->abbreviation();
-        }
-
-        foreach ($ca_individuals as $xref => $columns) {
-            $text .= "\n" . implode('|', $columns);
-        }
-
-        return $text . "\n.end_formatted_area.\n\n" . $ca_notes;
-    }
-
-    /**
-     * Find a media object.
-     */
-    private static function mediaFind() {
-        global $WT_TREE;
-
-        $controller = new SimpleController;
-        $filter     = Filter::get('filter');
-        $multiple   = Filter::getBool('multiple');
-
-        $controller
-            ->setPageTitle(I18N::translate('Find an individual'))
-            ->pageHeader();
-
-        ?>
+		}
+
+		/**
+		 * @param Individual $individual
+		 * @param string     $newged
+		 *
+		 * @return string
+		 */
+		public function updateCensusAssistant(Individual $individual, $fact_id, $newged, $keep_chan) {
+				$ca_title       = Filter::post('ca_title');
+				$ca_place       = Filter::post('ca_place');
+				$ca_citation    = Filter::post('ca_citation');
+				$ca_individuals = Filter::postArray('ca_individuals');
+				$ca_notes       = Filter::post('ca_notes');
+				$ca_census      = Filter::post('ca_census', 'Fisharebest\\\\Webtrees\\\\Census\\\\CensusOf[A-Za-z0-9]+');
+
+				if ($ca_census !== '' && !empty($ca_individuals)) {
+						$census = new $ca_census;
+
+						$note_text   = $this->createNoteText($census, $ca_title, $ca_place, $ca_citation, $ca_individuals, $ca_notes);
+						$note_gedcom = '0 @new@ NOTE ' . str_replace("\n", "\n1 CONT ", $note_text);
+						$note        = $individual->getTree()->createRecord($note_gedcom);
+
+						$newged .= "\n2 NOTE @" . $note->getXref() . '@';
+
+						// Add the census fact to the rest of the household
+						foreach (array_keys($ca_individuals) as $xref) {
+								if ($xref !== $individual->getXref()) {
+										Individual::getInstance($xref, $individual->getTree())
+												->updateFact($fact_id, $newged, !$keep_chan);
+								}
+						}
+				}
+
+				return $newged;
+		}
+
+		/**
+		 * @param CensusInterface $census
+		 * @param string          $ca_title
+		 * @param string          $ca_place
+		 * @param string          $ca_citation
+		 * @param string[][]      $ca_individuals
+		 * @param string          $ca_notes
+		 *
+		 * @return string
+		 */
+		private function createNoteText(CensusInterface $census, $ca_title, $ca_place, $ca_citation, $ca_individuals, $ca_notes) {
+				$text = $ca_title . "\n" . $ca_citation . "\n" . $ca_place . "\n\n.start_formatted_area.\n\n";
+
+				foreach ($census->columns() as $n => $column) {
+						if ($n > 0) {
+								$text .= '|';
+						}
+						$text .= '.b.' . $column->abbreviation();
+				}
+
+				foreach ($ca_individuals as $xref => $columns) {
+						$text .= "\n" . implode('|', $columns);
+				}
+
+				return $text . "\n.end_formatted_area.\n\n" . $ca_notes;
+		}
+
+		/**
+		 * Find a media object.
+		 */
+		private static function mediaFind() {
+				global $WT_TREE;
+
+				$controller = new SimpleController;
+				$filter     = Filter::get('filter');
+				$multiple   = Filter::getBool('multiple');
+
+				$controller
+						->setPageTitle(I18N::translate('Find an individual'))
+						->pageHeader();
+
+				?>
         <script>
             function pasterow (id, name, gend, yob, age, bpl) {
                 window.opener.opener.insertRowToTable(id, name, '', gend, '', yob, age, 'Y', '', bpl);
@@ -333,8 +333,8 @@ 
                 if (thumb) {
                     window.opener.paste_id(id, name, thumb);
                     <?php if (!$multiple) {
-                    echo 'window.close();';
-                } ?>
+										echo 'window.close();';
+								} ?>
                 } else {
                     // GEDFact_assistant ========================
                     if (window.opener.document.getElementById('addlinkQueue')) {
@@ -345,8 +345,8 @@ 
                         window.opener.pastename(name);
                     }
                     <?php if (!$multiple) {
-                    echo 'window.close();';
-                } ?>
+										echo 'window.close();';
+								} ?>
                 }
             }
 
@@ -369,27 +369,27 @@ 
         </script>
 
         <?php
-        echo '<div>';
-        echo '<table class="list_table width90" border="0">';
-        echo '<tr><td style="padding: 10px;" class="facts_label03 width90">'; // start column for find text header
-        echo $controller->getPageTitle();
-        echo '</td>';
-        echo '</tr>';
-        echo '</table>';
-        echo '<br>';
-        echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
-        echo '<br>';
-
-        $filter       = trim($filter);
-        $filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
-        echo '<table class="tabs_table width90"><tr>';
-        $myindilist = FunctionsDb::searchIndividualNames($filter_array, [$WT_TREE]);
-        if ($myindilist) {
-            echo '<td class="list_value_wrap"><ul>';
-            usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-            foreach ($myindilist as $indi) {
-                $nam = Filter::escapeHtml($indi->getFullName());
-                echo "<li><a href=\"#\" onclick=\"pasterow(
+				echo '<div>';
+				echo '<table class="list_table width90" border="0">';
+				echo '<tr><td style="padding: 10px;" class="facts_label03 width90">'; // start column for find text header
+				echo $controller->getPageTitle();
+				echo '</td>';
+				echo '</tr>';
+				echo '</table>';
+				echo '<br>';
+				echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
+				echo '<br>';
+
+				$filter       = trim($filter);
+				$filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
+				echo '<table class="tabs_table width90"><tr>';
+				$myindilist = FunctionsDb::searchIndividualNames($filter_array, [$WT_TREE]);
+				if ($myindilist) {
+						echo '<td class="list_value_wrap"><ul>';
+						usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+						foreach ($myindilist as $indi) {
+								$nam = Filter::escapeHtml($indi->getFullName());
+								echo "<li><a href=\"#\" onclick=\"pasterow(
 					'" . $indi->getXref() . "' ,
 					'" . $nam . "' ,
 					'" . $indi->getSex() . "' ,
@@ -398,44 +398,44 @@ 
 					'" . $indi->getBirthPlace() . "'); return false;\">
 					<b>" . $indi->getFullName() . '</b>&nbsp;&nbsp;&nbsp;';
 
-                $born = I18N::translate('Birth');
-                echo '</span><br><span class="list_item">', $born, ' ', $indi->getBirthYear(), '&nbsp;&nbsp;&nbsp;', $indi->getBirthPlace(), '</span></a></li>';
-                echo '<hr>';
-            }
-            echo '</ul></td></tr><tr><td class="list_label">', I18N::translate('Total individuals: %s', count($myindilist)), '</tr></td>';
-        } else {
-            echo '<td class="list_value_wrap">';
-            echo I18N::translate('No results found.');
-            echo '</td></tr>';
-        }
-        echo '</table>';
-        echo '</div>';
-    }
-
-    /**
-     * Search for a media object.
-     */
-    private static function mediaQuery() {
-        global $WT_TREE;
-
-        $iid2 = Filter::get('iid', WT_REGEX_XREF);
-
-        $controller = new SimpleController;
-        $controller
-            ->setPageTitle(I18N::translate('Link to an existing media object'))
-            ->pageHeader();
-
-        $record = GedcomRecord::getInstance($iid2, $WT_TREE);
-        if ($record) {
-            $headjs = '';
-            if ($record instanceof Family) {
-                if ($record->getHusband()) {
-                    $headjs = $record->getHusband()->getXref();
-                } elseif ($record->getWife()) {
-                    $headjs = $record->getWife()->getXref();
-                }
-            }
-            ?>
+								$born = I18N::translate('Birth');
+								echo '</span><br><span class="list_item">', $born, ' ', $indi->getBirthYear(), '&nbsp;&nbsp;&nbsp;', $indi->getBirthPlace(), '</span></a></li>';
+								echo '<hr>';
+						}
+						echo '</ul></td></tr><tr><td class="list_label">', I18N::translate('Total individuals: %s', count($myindilist)), '</tr></td>';
+				} else {
+						echo '<td class="list_value_wrap">';
+						echo I18N::translate('No results found.');
+						echo '</td></tr>';
+				}
+				echo '</table>';
+				echo '</div>';
+		}
+
+		/**
+		 * Search for a media object.
+		 */
+		private static function mediaQuery() {
+				global $WT_TREE;
+
+				$iid2 = Filter::get('iid', WT_REGEX_XREF);
+
+				$controller = new SimpleController;
+				$controller
+						->setPageTitle(I18N::translate('Link to an existing media object'))
+						->pageHeader();
+
+				$record = GedcomRecord::getInstance($iid2, $WT_TREE);
+				if ($record) {
+						$headjs = '';
+						if ($record instanceof Family) {
+								if ($record->getHusband()) {
+										$headjs = $record->getHusband()->getXref();
+								} elseif ($record->getWife()) {
+										$headjs = $record->getWife()->getXref();
+								}
+						}
+						?>
             <script>
                 function insertId () {
                     if (window.opener.document.getElementById('addlinkQueue')) {
@@ -446,8 +446,8 @@ 
                 }
             </script>
             <?php
-        } else {
-            ?>
+				} else {
+						?>
             <script>
                 function insertId () {
                     window.opener.alert('<?= $iid2 ?> - <?= I18N::translate('Not a valid individual, family, or source ID') ?>');
@@ -455,142 +455,142 @@ 
                 }
             </script>
             <?php
-        }
-        ?>
+				}
+				?>
         <script>window.onLoad = insertId();</script>
         <?php
-    }
-
-    /**
-     * Convert custom markup into HTML
-     *
-     * @param Note $note
-     *
-     * @return string
-     */
-    public static function formatCensusNote(Note $note) {
-        if (preg_match('/(.*)((?:\n.*)*)\n\.start_formatted_area\.\n(.+)\n(.+(?:\n.+)*)\n.end_formatted_area\.((?:\n.*)*)/', $note->getNote(), $match)) {
-            // This looks like a census-assistant shared note
-            $title     = Filter::escapeHtml($match[1]);
-            $preamble  = Filter::escapeHtml($match[2]);
-            $header    = Filter::escapeHtml($match[3]);
-            $data      = Filter::escapeHtml($match[4]);
-            $postamble = Filter::escapeHtml($match[5]);
-
-            // Get the column headers for the census to which this note refers
-            // requires the fact place & date to match the specific census
-            // censusPlace() (Soundex match) and censusDate() functions
-            $fmt_headers = [];
-            /** @var GedcomRecord[] $linkedRecords */
-            $linkedRecords = array_merge($note->linkedIndividuals('NOTE'), $note->linkedFamilies('NOTE'));
-            $firstRecord   = array_shift($linkedRecords);
-            if ($firstRecord) {
-                $countryCode = '';
-                $date        = '';
-                foreach ($firstRecord->getFacts('CENS') as $fact) {
-                    if (trim($fact->getAttribute('NOTE'), '@') === $note->getXref()) {
-                        $date        = $fact->getAttribute('DATE');
-                        $place       = explode(',', strip_tags($fact->getPlace()->getFullName()));
-                        $countryCode = Soundex::daitchMokotoff(array_pop($place));
-                        break;
-                    }
-                }
-
-                foreach (Census::allCensusPlaces() as $censusPlace) {
-                    if (Soundex::compare($countryCode, Soundex::daitchMokotoff($censusPlace->censusPlace()))) {
-                        foreach ($censusPlace->allCensusDates() as $census) {
-                            if ($census->censusDate() == $date) {
-                                foreach ($census->columns() as $column) {
-                                    $abbrev = $column->abbreviation();
-                                    if ($abbrev) {
-                                        $description          = $column->title() ? $column->title() : I18N::translate('Description unavailable');
-                                        $fmt_headers[$abbrev] = '<span title="' . $description . '">' . $abbrev . '</span>';
-                                    }
-                                }
-                                break 2;
-                            }
-                        }
-                    }
-                }
-            }
-            // Substitute header labels and format as HTML
-            $thead = '<tr><th>' . strtr(str_replace('|', '</th><th>', $header), $fmt_headers) . '</th></tr>';
-            $thead = str_replace('.b.', '', $thead);
-
-            // Format data as HTML
-            $tbody = '';
-            foreach (explode("\n", $data) as $row) {
-                $tbody .= '<tr>';
-                foreach (explode('|', $row) as $column) {
-                    $tbody .= '<td>' . $column . '</td>';
-                }
-                $tbody .= '</tr>';
-            }
-
-            return
-                $title . "\n" . // The newline allows the framework to expand the details and turn the first line into a link
-                '<div class="markdown">' .
-                '<p>' . $preamble . '</p>' .
-                '<table>' .
-                '<thead>' . $thead . '</thead>' .
-                '<tbody>' . $tbody . '</tbody>' .
-                '</table>' .
-                '<p>' . $postamble . '</p>' .
-                '</div>';
-        } else {
-            // Not a census-assistant shared note - apply default formatting
-            return Filter::formatText($note->getNote(), $note->getTree());
-        }
-    }
-
-    /**
-     * Generate an HTML row of data for the census header
-     * Add prefix cell (store XREF and drag/drop)
-     * Add suffix cell (delete button)
-     *
-     * @param CensusInterface $census
-     *
-     * @return string
-     */
-    public static function censusTableHeader(CensusInterface $census) {
-        $html = '';
-        foreach ($census->columns() as $column) {
-            $html .= '<th class="wt-census-assistant-field" title="' . $column->title() . '">' . $column->abbreviation() . '</th>';
-        }
-
-        return '<tr class="wt-census-assistant-row"><th hidden></th>' . $html . '<th></th></tr>';
-    }
-
-    /**
-     * Generate an HTML row of data for the census
-     * Add prefix cell (store XREF and drag/drop)
-     * Add suffix cell (delete button)
-     *
-     * @param CensusInterface $census
-     *
-     * @return string
-     */
-    public static function censusTableEmptyRow(CensusInterface $census) {
-        return '<tr class="wt-census-assistant-row"><td hidden></td>' . str_repeat('<td class="wt-census-assistant-field"><input type="text" class="form-control wt-census-assistant-form-control"></td>', count($census->columns())) . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
-    }
-
-    /**
-     * Generate an HTML row of data for the census
-     * Add prefix cell (store XREF and drag/drop)
-     * Add suffix cell (delete button)
-     *
-     * @param CensusInterface $census
-     * @param Individual      $individual
-     * @param Individual      $head
-     *
-     * @return string
-     */
-    public static function censusTableRow(CensusInterface $census, Individual $individual, Individual $head) {
-        $html = '';
-        foreach ($census->columns() as $column) {
-            $html .= '<td class="wt-census-assistant-field"><input class="form-control wt-census-assistant-form-control" type="text" value="' . $column->generate($individual, $head) . '" name="ca_individuals[' . $individual->getXref() . '][]"></td>';
-        }
-
-        return '<tr class="wt-census-assistant-row"><td class="wt-census-assistant-field" hidden>' . $individual->getXref() . '</td>' . $html . '<td class="wt-census-assistant-field"><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
-    }
+		}
+
+		/**
+		 * Convert custom markup into HTML
+		 *
+		 * @param Note $note
+		 *
+		 * @return string
+		 */
+		public static function formatCensusNote(Note $note) {
+				if (preg_match('/(.*)((?:\n.*)*)\n\.start_formatted_area\.\n(.+)\n(.+(?:\n.+)*)\n.end_formatted_area\.((?:\n.*)*)/', $note->getNote(), $match)) {
+						// This looks like a census-assistant shared note
+						$title     = Filter::escapeHtml($match[1]);
+						$preamble  = Filter::escapeHtml($match[2]);
+						$header    = Filter::escapeHtml($match[3]);
+						$data      = Filter::escapeHtml($match[4]);
+						$postamble = Filter::escapeHtml($match[5]);
+
+						// Get the column headers for the census to which this note refers
+						// requires the fact place & date to match the specific census
+						// censusPlace() (Soundex match) and censusDate() functions
+						$fmt_headers = [];
+						/** @var GedcomRecord[] $linkedRecords */
+						$linkedRecords = array_merge($note->linkedIndividuals('NOTE'), $note->linkedFamilies('NOTE'));
+						$firstRecord   = array_shift($linkedRecords);
+						if ($firstRecord) {
+								$countryCode = '';
+								$date        = '';
+								foreach ($firstRecord->getFacts('CENS') as $fact) {
+										if (trim($fact->getAttribute('NOTE'), '@') === $note->getXref()) {
+												$date        = $fact->getAttribute('DATE');
+												$place       = explode(',', strip_tags($fact->getPlace()->getFullName()));
+												$countryCode = Soundex::daitchMokotoff(array_pop($place));
+												break;
+										}
+								}
+
+								foreach (Census::allCensusPlaces() as $censusPlace) {
+										if (Soundex::compare($countryCode, Soundex::daitchMokotoff($censusPlace->censusPlace()))) {
+												foreach ($censusPlace->allCensusDates() as $census) {
+														if ($census->censusDate() == $date) {
+																foreach ($census->columns() as $column) {
+																		$abbrev = $column->abbreviation();
+																		if ($abbrev) {
+																				$description          = $column->title() ? $column->title() : I18N::translate('Description unavailable');
+																				$fmt_headers[$abbrev] = '<span title="' . $description . '">' . $abbrev . '</span>';
+																		}
+																}
+																break 2;
+														}
+												}
+										}
+								}
+						}
+						// Substitute header labels and format as HTML
+						$thead = '<tr><th>' . strtr(str_replace('|', '</th><th>', $header), $fmt_headers) . '</th></tr>';
+						$thead = str_replace('.b.', '', $thead);
+
+						// Format data as HTML
+						$tbody = '';
+						foreach (explode("\n", $data) as $row) {
+								$tbody .= '<tr>';
+								foreach (explode('|', $row) as $column) {
+										$tbody .= '<td>' . $column . '</td>';
+								}
+								$tbody .= '</tr>';
+						}
+
+						return
+								$title . "\n" . // The newline allows the framework to expand the details and turn the first line into a link
+								'<div class="markdown">' .
+								'<p>' . $preamble . '</p>' .
+								'<table>' .
+								'<thead>' . $thead . '</thead>' .
+								'<tbody>' . $tbody . '</tbody>' .
+								'</table>' .
+								'<p>' . $postamble . '</p>' .
+								'</div>';
+				} else {
+						// Not a census-assistant shared note - apply default formatting
+						return Filter::formatText($note->getNote(), $note->getTree());
+				}
+		}
+
+		/**
+		 * Generate an HTML row of data for the census header
+		 * Add prefix cell (store XREF and drag/drop)
+		 * Add suffix cell (delete button)
+		 *
+		 * @param CensusInterface $census
+		 *
+		 * @return string
+		 */
+		public static function censusTableHeader(CensusInterface $census) {
+				$html = '';
+				foreach ($census->columns() as $column) {
+						$html .= '<th class="wt-census-assistant-field" title="' . $column->title() . '">' . $column->abbreviation() . '</th>';
+				}
+
+				return '<tr class="wt-census-assistant-row"><th hidden></th>' . $html . '<th></th></tr>';
+		}
+
+		/**
+		 * Generate an HTML row of data for the census
+		 * Add prefix cell (store XREF and drag/drop)
+		 * Add suffix cell (delete button)
+		 *
+		 * @param CensusInterface $census
+		 *
+		 * @return string
+		 */
+		public static function censusTableEmptyRow(CensusInterface $census) {
+				return '<tr class="wt-census-assistant-row"><td hidden></td>' . str_repeat('<td class="wt-census-assistant-field"><input type="text" class="form-control wt-census-assistant-form-control"></td>', count($census->columns())) . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
+		}
+
+		/**
+		 * Generate an HTML row of data for the census
+		 * Add prefix cell (store XREF and drag/drop)
+		 * Add suffix cell (delete button)
+		 *
+		 * @param CensusInterface $census
+		 * @param Individual      $individual
+		 * @param Individual      $head
+		 *
+		 * @return string
+		 */
+		public static function censusTableRow(CensusInterface $census, Individual $individual, Individual $head) {
+				$html = '';
+				foreach ($census->columns() as $column) {
+						$html .= '<td class="wt-census-assistant-field"><input class="form-control wt-census-assistant-form-control" type="text" value="' . $column->generate($individual, $head) . '" name="ca_individuals[' . $individual->getXref() . '][]"></td>';
+				}
+
+				return '<tr class="wt-census-assistant-row"><td class="wt-census-assistant-field" hidden>' . $individual->getXref() . '</td>' . $html . '<td class="wt-census-assistant-field"><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
+		}
 }

app/Census/CensusColumnAgeFemale5Years.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 				$years -= $years % 5;
 			}
 
-			return (string)$years;
+			return (string) $years;
 		}
 	}
 }