fisharebest / webtrees

app/Module/ResearchTaskModule.php

Indentation +171 added lines, -171 removed lines

@@ -29,58 +29,58 @@ 
  * Class ResearchTaskModule
  */
 class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface {
-	const DEFAULT_SHOW_OTHER      = '1';
-	const DEFAULT_SHOW_UNASSIGNED = '1';
-	const DEFAULT_SHOW_FUTURE     = '1';
-	const DEFAULT_BLOCK           = '1';
-
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module. Tasks that need further research. */ I18N::translate('Research tasks');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of “Research tasks” module */ I18N::translate('A list of tasks and activities that are linked to the family tree.');
-	}
-
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		global $ctype, $controller, $WT_TREE;
-
-		$show_other      = $this->getBlockSetting($block_id, 'show_other', self::DEFAULT_SHOW_OTHER);
-		$show_unassigned = $this->getBlockSetting($block_id, 'show_unassigned', self::DEFAULT_SHOW_UNASSIGNED);
-		$show_future     = $this->getBlockSetting($block_id, 'show_future', self::DEFAULT_SHOW_FUTURE);
-		$block           = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
-
-		foreach (array('show_unassigned', 'show_other', 'show_future', 'block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-		} else {
-			$title = '';
-		}
-		$title .= $this->getTitle();
-
-		$table_id = Uuid::uuid4(); // create a unique ID
-
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+    const DEFAULT_SHOW_OTHER      = '1';
+    const DEFAULT_SHOW_UNASSIGNED = '1';
+    const DEFAULT_SHOW_FUTURE     = '1';
+    const DEFAULT_BLOCK           = '1';
+
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module. Tasks that need further research. */ I18N::translate('Research tasks');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of “Research tasks” module */ I18N::translate('A list of tasks and activities that are linked to the family tree.');
+    }
+
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        global $ctype, $controller, $WT_TREE;
+
+        $show_other      = $this->getBlockSetting($block_id, 'show_other', self::DEFAULT_SHOW_OTHER);
+        $show_unassigned = $this->getBlockSetting($block_id, 'show_unassigned', self::DEFAULT_SHOW_UNASSIGNED);
+        $show_future     = $this->getBlockSetting($block_id, 'show_future', self::DEFAULT_SHOW_FUTURE);
+        $block           = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
+
+        foreach (array('show_unassigned', 'show_other', 'show_future', 'block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+            $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+        } else {
+            $title = '';
+        }
+        $title .= $this->getTitle();
+
+        $table_id = Uuid::uuid4(); // create a unique ID
+
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 			jQuery("#' . $table_id . '").dataTable({
 				dom: \'t\',
 				' . I18N::datatablesI18N() . ',
@@ -101,101 +101,101 @@ 
 			jQuery(".loading-image").css("display", "none");
 		');
 
-		$content = '';
-		$content .= '<div class="loading-image">&nbsp;</div>';
-		$content .= '<table id="' . $table_id . '" style="visibility:hidden;">';
-		$content .= '<thead><tr>';
-		$content .= '<th>' . GedcomTag::getLabel('DATE') . '</th>';
-		$content .= '<th>' . I18N::translate('Record') . '</th>';
-		$content .= '<th>' . I18N::translate('Username') . '</th>';
-		$content .= '<th>' . GedcomTag::getLabel('TEXT') . '</th>';
-		$content .= '</tr></thead><tbody>';
-
-		$found  = false;
-		$end_jd = $show_future ? 99999999 : WT_CLIENT_JD;
-
-		$xrefs = Database::prepare(
-			"SELECT DISTINCT d_gid FROM `##dates`" .
-			" WHERE d_file = :tree_id AND d_fact = '_TODO' AND d_julianday1 < :jd"
-		)->execute(array(
-			'tree_id' => $WT_TREE->getTreeId(),
-			'jd'      => $end_jd,
-		))->fetchOneColumn();
-
-		$facts = array();
-		foreach ($xrefs as $xref) {
-			$record = GedcomRecord::getInstance($xref, $WT_TREE);
-			if ($record->canShow()) {
-				foreach ($record->getFacts('_TODO') as $fact) {
-					$facts[] = $fact;
-				}
-			}
-		}
-
-		foreach ($facts as $fact) {
-			$record    = $fact->getParent();
-			$user_name = $fact->getAttribute('_WT_USER');
-			if ($user_name === Auth::user()->getUserName() || !$user_name && $show_unassigned || $user_name && $show_other) {
-				$content .= '<tr>';
-				$content .= '<td data-sort="' . $fact->getDate()->julianDay() . '">' . $fact->getDate()->display() . '</td>';
-				$content .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '"><a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a></td>';
-				$content .= '<td>' . $user_name . '</td>';
-				$content .= '<td dir="auto">' . $fact->getValue() . '</td>';
-				$content .= '</tr>';
-				$found = true;
-			}
-		}
-
-		$content .= '</tbody></table>';
-		if (!$found) {
-			$content .= '<p>' . I18N::translate('There are no research tasks in this family tree.') . '</p>';
-		}
-
-		if ($template) {
-			if ($block) {
-				$class .= ' small_inner_block';
-			}
-
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'show_other', Filter::postBool('show_other'));
-			$this->setBlockSetting($block_id, 'show_unassigned', Filter::postBool('show_unassigned'));
-			$this->setBlockSetting($block_id, 'show_future', Filter::postBool('show_future'));
-			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
-		}
-
-		$show_other      = $this->getBlockSetting($block_id, 'show_other', self::DEFAULT_SHOW_OTHER);
-		$show_unassigned = $this->getBlockSetting($block_id, 'show_unassigned', self::DEFAULT_SHOW_UNASSIGNED);
-		$show_future     = $this->getBlockSetting($block_id, 'show_future', self::DEFAULT_SHOW_FUTURE);
-		$block           = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
-
-		?>
+        $content = '';
+        $content .= '<div class="loading-image">&nbsp;</div>';
+        $content .= '<table id="' . $table_id . '" style="visibility:hidden;">';
+        $content .= '<thead><tr>';
+        $content .= '<th>' . GedcomTag::getLabel('DATE') . '</th>';
+        $content .= '<th>' . I18N::translate('Record') . '</th>';
+        $content .= '<th>' . I18N::translate('Username') . '</th>';
+        $content .= '<th>' . GedcomTag::getLabel('TEXT') . '</th>';
+        $content .= '</tr></thead><tbody>';
+
+        $found  = false;
+        $end_jd = $show_future ? 99999999 : WT_CLIENT_JD;
+
+        $xrefs = Database::prepare(
+            "SELECT DISTINCT d_gid FROM `##dates`" .
+            " WHERE d_file = :tree_id AND d_fact = '_TODO' AND d_julianday1 < :jd"
+        )->execute(array(
+            'tree_id' => $WT_TREE->getTreeId(),
+            'jd'      => $end_jd,
+        ))->fetchOneColumn();
+
+        $facts = array();
+        foreach ($xrefs as $xref) {
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            if ($record->canShow()) {
+                foreach ($record->getFacts('_TODO') as $fact) {
+                    $facts[] = $fact;
+                }
+            }
+        }
+
+        foreach ($facts as $fact) {
+            $record    = $fact->getParent();
+            $user_name = $fact->getAttribute('_WT_USER');
+            if ($user_name === Auth::user()->getUserName() || !$user_name && $show_unassigned || $user_name && $show_other) {
+                $content .= '<tr>';
+                $content .= '<td data-sort="' . $fact->getDate()->julianDay() . '">' . $fact->getDate()->display() . '</td>';
+                $content .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '"><a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a></td>';
+                $content .= '<td>' . $user_name . '</td>';
+                $content .= '<td dir="auto">' . $fact->getValue() . '</td>';
+                $content .= '</tr>';
+                $found = true;
+            }
+        }
+
+        $content .= '</tbody></table>';
+        if (!$found) {
+            $content .= '<p>' . I18N::translate('There are no research tasks in this family tree.') . '</p>';
+        }
+
+        if ($template) {
+            if ($block) {
+                $class .= ' small_inner_block';
+            }
+
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'show_other', Filter::postBool('show_other'));
+            $this->setBlockSetting($block_id, 'show_unassigned', Filter::postBool('show_unassigned'));
+            $this->setBlockSetting($block_id, 'show_future', Filter::postBool('show_future'));
+            $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
+        }
+
+        $show_other      = $this->getBlockSetting($block_id, 'show_other', self::DEFAULT_SHOW_OTHER);
+        $show_unassigned = $this->getBlockSetting($block_id, 'show_unassigned', self::DEFAULT_SHOW_UNASSIGNED);
+        $show_future     = $this->getBlockSetting($block_id, 'show_future', self::DEFAULT_SHOW_FUTURE);
+        $block           = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
+
+        ?>
 		<tr>
 			<td colspan="2">
 				<?php echo I18N::translate('Research tasks are special events, added to individuals in your family tree, which identify the need for further research. You can use them as a reminder to check facts against more reliable sources, to obtain documents or photographs, to resolve conflicting information, etc.'); ?>
@@ -205,28 +205,28 @@ 
 		</tr>
 		<?php
 
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Show research tasks that are assigned to other users');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('show_other', $show_other);
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Show research tasks that are not assigned to any user');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('show_unassigned', $show_unassigned);
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Show research tasks that have a date in the future');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('show_future', $show_future);
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('block', $block);
-		echo '</td></tr>';
-	}
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Show research tasks that are assigned to other users');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('show_other', $show_other);
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Show research tasks that are not assigned to any user');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('show_unassigned', $show_unassigned);
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Show research tasks that have a date in the future');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('show_future', $show_future);
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('block', $block);
+        echo '</td></tr>';
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -28,19 +28,22 @@ 
 /**
  * Class ResearchTaskModule
  */
-class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface {
+class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface
+{
 	const DEFAULT_SHOW_OTHER      = '1';
 	const DEFAULT_SHOW_UNASSIGNED = '1';
 	const DEFAULT_SHOW_FUTURE     = '1';
 	const DEFAULT_BLOCK           = '1';
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module. Tasks that need further research. */ I18N::translate('Research tasks');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of “Research tasks” module */ I18N::translate('A list of tasks and activities that are linked to the family tree.');
 	}
 
@@ -53,7 +56,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $ctype, $controller, $WT_TREE;
 
 		$show_other      = $this->getBlockSetting($block_id, 'show_other', self::DEFAULT_SHOW_OTHER);
@@ -163,17 +167,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -182,7 +189,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'show_other', Filter::postBool('show_other'));
 			$this->setBlockSetting($block_id, 'show_unassigned', Filter::postBool('show_unassigned'));

app/Module/StatisticsChartModule.php

Indentation +47 added lines, -47 removed lines

@@ -24,55 +24,55 @@
  * Class StatisticsChartModule
  */
 class StatisticsChartModule extends AbstractModule implements ModuleChartInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module/chart */ I18N::translate('Statistics');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module/chart */ I18N::translate('Statistics');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “StatisticsChart” module */ I18N::translate('Various statistics charts.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “StatisticsChart” module */ I18N::translate('Various statistics charts.');
+    }
 
-	/**
-	 * What is the default access level for this module?
-	 *
-	 * Some modules are aimed at admins or managers, and are not generally shown to users.
-	 *
-	 * @return int
-	 */
-	public function defaultAccessLevel() {
-		return Auth::PRIV_PRIVATE;
-	}
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_PRIVATE;
+    }
 
-	/**
-	 * Return a menu item for this chart.
-	 *
-	 * @return Menu|null
-	 */
-	public function getChartMenu(Individual $individual) {
-		return new Menu(
-			$this->getTitle(),
-			'statistics.php?ged=' . $individual->getTree()->getNameUrl(),
-			'menu-chart-statistics',
-			array('rel' => 'nofollow')
-		);
-	}
+    /**
+     * Return a menu item for this chart.
+     *
+     * @return Menu|null
+     */
+    public function getChartMenu(Individual $individual) {
+        return new Menu(
+            $this->getTitle(),
+            'statistics.php?ged=' . $individual->getTree()->getNameUrl(),
+            'menu-chart-statistics',
+            array('rel' => 'nofollow')
+        );
+    }
 
-	/**
-	 * Return a menu item for this chart - for use in individual boxes.
-	 *
-	 * @return Menu|null
-	 */
-	public function getBoxChartMenu(Individual $individual) {
-		return null;
-	}
+    /**
+     * Return a menu item for this chart - for use in individual boxes.
+     *
+     * @return Menu|null
+     */
+    public function getBoxChartMenu(Individual $individual) {
+        return null;
+    }
 }

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class StatisticsChartModule
  */
-class StatisticsChartModule extends AbstractModule implements ModuleChartInterface {
+class StatisticsChartModule extends AbstractModule implements ModuleChartInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Statistics');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “StatisticsChart” module */ I18N::translate('Various statistics charts.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -58,7 +62,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'statistics.php?ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return null;
 	}
 }

app/Module/IndividualFactsTabModule.php

Indentation +468 added lines, -468 removed lines

@@ -31,95 +31,95 @@ 
  * Class IndividualFactsTabModule
  */
 class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module/tab on the individual page. */ I18N::translate('Facts and events');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Facts and events” module */ I18N::translate('A tab showing the facts and events of an individual.');
-	}
-
-	/** {@inheritdoc} */
-	public function defaultTabOrder() {
-		return 10;
-	}
-
-	/** {@inheritdoc} */
-	public function isGrayedOut() {
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function getTabContent() {
-		global $controller;
-		$EXPAND_HISTO_EVENTS = false;
-
-		$indifacts = array();
-		// The individual’s own facts
-		foreach ($controller->record->getFacts() as $fact) {
-			switch ($fact->getTag()) {
-			case 'SEX':
-			case 'NAME':
-			case 'SOUR':
-			case 'OBJE':
-			case 'NOTE':
-			case 'FAMC':
-			case 'FAMS':
-				break;
-			default:
-				if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) {
-					$indifacts[] = $fact;
-				}
-				break;
-			}
-		}
-
-		// Add spouse-family facts
-		foreach ($controller->record->getSpouseFamilies() as $family) {
-			foreach ($family->getFacts() as $fact) {
-				switch ($fact->getTag()) {
-				case 'SOUR':
-				case 'NOTE':
-				case 'OBJE':
-				case 'CHAN':
-				case '_UID':
-				case 'RIN':
-				case 'HUSB':
-				case 'WIFE':
-				case 'CHIL':
-					break;
-				default:
-					$indifacts[] = $fact;
-					break;
-				}
-			}
-			$spouse = $family->getSpouse($controller->record);
-			if ($spouse) {
-				foreach (self::spouseFacts($controller->record, $spouse) as $fact) {
-					$indifacts[] = $fact;
-				}
-			}
-			foreach (self::childFacts($controller->record, $family, '_CHIL', '') as $fact) {
-				$indifacts[] = $fact;
-			}
-		}
-
-		foreach (self::parentFacts($controller->record, 1) as $fact) {
-			$indifacts[] = $fact;
-		}
-		foreach (self::historicalFacts($controller->record) as $fact) {
-			$indifacts[] = $fact;
-		}
-		foreach (self::associateFacts($controller->record) as $fact) {
-			$indifacts[] = $fact;
-		}
-
-		Functions::sortFacts($indifacts);
-
-		ob_start();
-		?>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module/tab on the individual page. */ I18N::translate('Facts and events');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Facts and events” module */ I18N::translate('A tab showing the facts and events of an individual.');
+    }
+
+    /** {@inheritdoc} */
+    public function defaultTabOrder() {
+        return 10;
+    }
+
+    /** {@inheritdoc} */
+    public function isGrayedOut() {
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function getTabContent() {
+        global $controller;
+        $EXPAND_HISTO_EVENTS = false;
+
+        $indifacts = array();
+        // The individual’s own facts
+        foreach ($controller->record->getFacts() as $fact) {
+            switch ($fact->getTag()) {
+            case 'SEX':
+            case 'NAME':
+            case 'SOUR':
+            case 'OBJE':
+            case 'NOTE':
+            case 'FAMC':
+            case 'FAMS':
+                break;
+            default:
+                if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) {
+                    $indifacts[] = $fact;
+                }
+                break;
+            }
+        }
+
+        // Add spouse-family facts
+        foreach ($controller->record->getSpouseFamilies() as $family) {
+            foreach ($family->getFacts() as $fact) {
+                switch ($fact->getTag()) {
+                case 'SOUR':
+                case 'NOTE':
+                case 'OBJE':
+                case 'CHAN':
+                case '_UID':
+                case 'RIN':
+                case 'HUSB':
+                case 'WIFE':
+                case 'CHIL':
+                    break;
+                default:
+                    $indifacts[] = $fact;
+                    break;
+                }
+            }
+            $spouse = $family->getSpouse($controller->record);
+            if ($spouse) {
+                foreach (self::spouseFacts($controller->record, $spouse) as $fact) {
+                    $indifacts[] = $fact;
+                }
+            }
+            foreach (self::childFacts($controller->record, $family, '_CHIL', '') as $fact) {
+                $indifacts[] = $fact;
+            }
+        }
+
+        foreach (self::parentFacts($controller->record, 1) as $fact) {
+            $indifacts[] = $fact;
+        }
+        foreach (self::historicalFacts($controller->record) as $fact) {
+            $indifacts[] = $fact;
+        }
+        foreach (self::associateFacts($controller->record) as $fact) {
+            $indifacts[] = $fact;
+        }
+
+        Functions::sortFacts($indifacts);
+
+        ob_start();
+        ?>
 		<table class="facts_table">
 			<colgroup>
 				<col class="width20">
@@ -144,20 +144,20 @@ 
 				</tr>
 				<?php
 
-		if (!$indifacts) {
-			echo '<tr><td colspan="2" class="facts_value">', I18N::translate('There are no facts for this individual.'), '</td></tr>';
-		}
+        if (!$indifacts) {
+            echo '<tr><td colspan="2" class="facts_value">', I18N::translate('There are no facts for this individual.'), '</td></tr>';
+        }
 
-		foreach ($indifacts as $fact) {
-			FunctionsPrintFacts::printFact($fact, $controller->record);
-		}
+        foreach ($indifacts as $fact) {
+            FunctionsPrintFacts::printFact($fact, $controller->record);
+        }
 
-		//-- new fact link
-		if ($controller->record->canEdit()) {
-			FunctionsPrint::printAddNewFact($controller->record->getXref(), $indifacts, 'INDI');
-		}
+        //-- new fact link
+        if ($controller->record->canEdit()) {
+            FunctionsPrint::printAddNewFact($controller->record->getXref(), $indifacts, 'INDI');
+        }
 
-		?>
+        ?>
 			</tbody>
 		</table>
 		<script>
@@ -166,372 +166,372 @@ 
 		</script>
 		<?php
 
-		return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
-	}
-
-	/** {@inheritdoc} */
-	public function hasTabContent() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function canLoadAjax() {
-		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
-	}
-
-	/** {@inheritdoc} */
-	public function getPreLoadContent() {
-		return '';
-	}
-
-	/**
-	 * Spouse facts that are shown on an individual’s page.
-	 *
-	 * @param Individual $individual Show events that occured during the lifetime of this individual
-	 * @param Individual $spouse     Show events of this individual
-	 *
-	 * @return Fact[]
-	 */
-	private static function spouseFacts(Individual $individual, Individual $spouse) {
-		$SHOW_RELATIVES_EVENTS = $individual->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
-
-		$facts = array();
-		if (strstr($SHOW_RELATIVES_EVENTS, '_DEAT_SPOU')) {
-			// Only include events between birth and death
-			$birt_date = $individual->getEstimatedBirthDate();
-			$deat_date = $individual->getEstimatedDeathDate();
-
-			foreach ($spouse->getFacts(WT_EVENTS_DEAT) as $fact) {
-
-				$fact_date = $fact->getDate();
-				if ($fact_date->isOK() && Date::compare($birt_date, $fact_date) <= 0 && Date::compare($fact_date, $deat_date) <= 0) {
-					// Convert the event to a close relatives event.
-					$rela_fact = clone($fact);
-					$rela_fact->setTag('_' . $fact->getTag() . '_SPOU');
-					$facts[] = $rela_fact;
-				}
-			}
-		}
-
-		return $facts;
-	}
-
-	/**
-	 * Get the events of children and grandchildren.
-	 *
-	 * @param Individual $person
-	 * @param Family     $family
-	 * @param string     $option
-	 * @param string     $relation
-	 *
-	 * @return Fact[]
-	 */
-	private static function childFacts(Individual $person, Family $family, $option, $relation) {
-		global $controller;
-
-		$SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
-
-		$facts = array();
-
-		// Only include events between birth and death
-		$birt_date = $controller->record->getEstimatedBirthDate();
-		$deat_date = $controller->record->getEstimatedDeathDate();
-
-		// Deal with recursion.
-		switch ($option) {
-		case '_CHIL':
-			// Add grandchildren
-			foreach ($family->getChildren() as $child) {
-				foreach ($child->getSpouseFamilies() as $cfamily) {
-					switch ($child->getSex()) {
-					case 'M':
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					case 'F':
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					default:
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					}
-				}
-			}
-			break;
-		}
-
-		// For each child in the family
-		foreach ($family->getChildren() as $child) {
-			if ($child->getXref() == $person->getXref()) {
-				// We are not our own sibling!
-				continue;
-			}
-			// add child’s birth
-			if (strpos($SHOW_RELATIVES_EVENTS, '_BIRT' . str_replace('_HSIB', '_SIBL', $option)) !== false) {
-				foreach ($child->getFacts(WT_EVENTS_BIRT) as $fact) {
-					$sgdate = $fact->getDate();
-					// Always show _BIRT_CHIL, even if the dates are not known
-					if ($option == '_CHIL' || $sgdate->isOK() && Date::compare($birt_date, $sgdate) <= 0 && Date::compare($sgdate, $deat_date) <= 0) {
-						if ($option == '_GCHI' && $relation == 'dau') {
-							// Convert the event to a close relatives event.
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . '_GCH1');
-							$facts[] = $rela_fact;
-						} elseif ($option == '_GCHI' && $relation == 'son') {
-							// Convert the event to a close relatives event.
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . '_GCH2');
-							$facts[] = $rela_fact;
-						} else {
-							// Convert the event to a close relatives event.
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . $option);
-							$facts[] = $rela_fact;
-						}
-					}
-				}
-			}
-			// add child’s death
-			if (strpos($SHOW_RELATIVES_EVENTS, '_DEAT' . str_replace('_HSIB', '_SIBL', $option)) !== false) {
-				foreach ($child->getFacts(WT_EVENTS_DEAT) as $fact) {
-					$sgdate = $fact->getDate();
-					if ($sgdate->isOK() && Date::compare($birt_date, $sgdate) <= 0 && Date::compare($sgdate, $deat_date) <= 0) {
-						if ($option == '_GCHI' && $relation == 'dau') {
-							// Convert the event to a close relatives event.
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . '_GCH1');
-							$facts[] = $rela_fact;
-						} elseif ($option == '_GCHI' && $relation == 'son') {
-							// Convert the event to a close relatives event.
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . '_GCH2');
-							$facts[] = $rela_fact;
-						} else {
-							// Convert the event to a close relatives event.
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . $option);
-							$facts[] = $rela_fact;
-						}
-					}
-				}
-			}
-			// add child’s marriage
-			if (strstr($SHOW_RELATIVES_EVENTS, '_MARR' . str_replace('_HSIB', '_SIBL', $option))) {
-				foreach ($child->getSpouseFamilies() as $sfamily) {
-					foreach ($sfamily->getFacts(WT_EVENTS_MARR) as $fact) {
-						$sgdate = $fact->getDate();
-						if ($sgdate->isOK() && Date::compare($birt_date, $sgdate) <= 0 && Date::compare($sgdate, $deat_date) <= 0) {
-							if ($option == '_GCHI' && $relation == 'dau') {
-								// Convert the event to a close relatives event.
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GCH1');
-								$facts[] = $rela_fact;
-							} elseif ($option == '_GCHI' && $relation == 'son') {
-								// Convert the event to a close relatives event.
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GCH2');
-								$facts[] = $rela_fact;
-							} else {
-								// Convert the event to a close relatives event.
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . $option);
-								$facts[] = $rela_fact;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return $facts;
-	}
-
-	/**
-	 * Get the events of parents and grandparents.
-	 *
-	 * @param Individual $person
-	 * @param int        $sosa
-	 *
-	 * @return Fact[]
-	 */
-	private static function parentFacts(Individual $person, $sosa) {
-		global $controller;
-
-		$SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
-
-		$facts = array();
-
-		// Only include events between birth and death
-		$birt_date = $controller->record->getEstimatedBirthDate();
-		$deat_date = $controller->record->getEstimatedDeathDate();
-
-		if ($sosa == 1) {
-			foreach ($person->getChildFamilies() as $family) {
-				// Add siblings
-				foreach (self::childFacts($person, $family, '_SIBL', '') as $fact) {
-					$facts[] = $fact;
-				}
-				foreach ($family->getSpouses() as $spouse) {
-					foreach ($spouse->getSpouseFamilies() as $sfamily) {
-						if ($family !== $sfamily) {
-							// Add half-siblings
-							foreach (self::childFacts($person, $sfamily, '_HSIB', '') as $fact) {
-								$facts[] = $fact;
-							}
-						}
-					}
-					// Add grandparents
-					foreach (self::parentFacts($spouse, $spouse->getSex() == 'F' ? 3 : 2) as $fact) {
-						$facts[] = $fact;
-					}
-				}
-			}
-
-			if (strstr($SHOW_RELATIVES_EVENTS, '_MARR_PARE')) {
-				// add father/mother marriages
-				foreach ($person->getChildFamilies() as $sfamily) {
-					foreach ($sfamily->getFacts(WT_EVENTS_MARR) as $fact) {
-						if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
-							// marriage of parents (to each other)
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . '_FAMC');
-							$facts[] = $rela_fact;
-						}
-					}
-				}
-				foreach ($person->getChildStepFamilies() as $sfamily) {
-					foreach ($sfamily->getFacts(WT_EVENTS_MARR) as $fact) {
-						if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
-							// marriage of a parent (to another spouse)
-							// Convert the event to a close relatives event
-							$rela_fact = clone($fact);
-							$rela_fact->setTag('_' . $fact->getTag() . '_PARE');
-							$facts[] = $rela_fact;
-						}
-					}
-				}
-			}
-		}
-
-		foreach ($person->getChildFamilies() as $family) {
-			foreach ($family->getSpouses() as $parent) {
-				if (strstr($SHOW_RELATIVES_EVENTS, '_DEAT' . ($sosa == 1 ? '_PARE' : '_GPAR'))) {
-					foreach ($parent->getFacts(WT_EVENTS_DEAT) as $fact) {
-						if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
-							switch ($sosa) {
-							case 1:
-								// Convert the event to a close relatives event.
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_PARE');
-								$facts[] = $rela_fact;
-								break;
-							case 2:
-								// Convert the event to a close relatives event
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GPA1');
-								$facts[] = $rela_fact;
-								break;
-							case 3:
-								// Convert the event to a close relatives event
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GPA2');
-								$facts[] = $rela_fact;
-								break;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return $facts;
-	}
-
-	/**
-	 * Get any historical events.
-	 *
-	 * @param Individual $person
-	 *
-	 * @return Fact[]
-	 */
-	private static function historicalFacts(Individual $person) {
-		$SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
-
-		$facts = array();
-
-		if ($SHOW_RELATIVES_EVENTS) {
-			// Only include events between birth and death
-			$birt_date = $person->getEstimatedBirthDate();
-			$deat_date = $person->getEstimatedDeathDate();
-
-			if (file_exists(Site::getPreference('INDEX_DIRECTORY') . 'histo.' . WT_LOCALE . '.php')) {
-				$histo = array();
-				require Site::getPreference('INDEX_DIRECTORY') . 'histo.' . WT_LOCALE . '.php';
-				foreach ($histo as $hist) {
-					// Earlier versions of the WIKI encouraged people to use HTML entities,
-					// rather than UTF8 encoding.
-					$hist = html_entity_decode($hist, ENT_QUOTES, 'UTF-8');
-
-					$fact  = new Fact($hist, $person, 'histo');
-					$sdate = $fact->getDate();
-					if ($sdate->isOK() && Date::compare($birt_date, $sdate) <= 0 && Date::compare($sdate, $deat_date) <= 0) {
-						$facts[] = $fact;
-					}
-				}
-			}
-		}
-
-		return $facts;
-	}
-
-	/**
-	 * Get the events of associates.
-	 *
-	 * @param Individual $person
-	 *
-	 * @return Fact[]
-	 */
-	private static function associateFacts(Individual $person) {
-		$facts = array();
-
-		$associates = array_merge(
-			$person->linkedIndividuals('ASSO'),
-			$person->linkedIndividuals('_ASSO'),
-			$person->linkedFamilies('ASSO'),
-			$person->linkedFamilies('_ASSO')
-		);
-		foreach ($associates as $associate) {
-			foreach ($associate->getFacts() as $fact) {
-				$arec = $fact->getAttribute('_ASSO');
-				if (!$arec) {
-					$arec = $fact->getAttribute('ASSO');
-				}
-				if ($arec && trim($arec, '@') === $person->getXref()) {
-					// Extract the important details from the fact
-					$factrec = '1 ' . $fact->getTag();
-					if (preg_match('/\n2 DATE .*/', $fact->getGedcom(), $match)) {
-						$factrec .= $match[0];
-					}
-					if (preg_match('/\n2 PLAC .*/', $fact->getGedcom(), $match)) {
-						$factrec .= $match[0];
-					}
-					if ($associate instanceof Family) {
-						foreach ($associate->getSpouses() as $spouse) {
-							$factrec .= "\n2 _ASSO @" . $spouse->getXref() . '@';
-						}
-					} else {
-						$factrec .= "\n2 _ASSO @" . $associate->getXref() . '@';
-					}
-					$facts[] = new Fact($factrec, $associate, 'asso');
-				}
-			}
-		}
-
-		return $facts;
-	}
+        return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
+    }
+
+    /** {@inheritdoc} */
+    public function hasTabContent() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function canLoadAjax() {
+        return !Auth::isSearchEngine(); // Search engines cannot use AJAX
+    }
+
+    /** {@inheritdoc} */
+    public function getPreLoadContent() {
+        return '';
+    }
+
+    /**
+     * Spouse facts that are shown on an individual’s page.
+     *
+     * @param Individual $individual Show events that occured during the lifetime of this individual
+     * @param Individual $spouse     Show events of this individual
+     *
+     * @return Fact[]
+     */
+    private static function spouseFacts(Individual $individual, Individual $spouse) {
+        $SHOW_RELATIVES_EVENTS = $individual->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
+
+        $facts = array();
+        if (strstr($SHOW_RELATIVES_EVENTS, '_DEAT_SPOU')) {
+            // Only include events between birth and death
+            $birt_date = $individual->getEstimatedBirthDate();
+            $deat_date = $individual->getEstimatedDeathDate();
+
+            foreach ($spouse->getFacts(WT_EVENTS_DEAT) as $fact) {
+
+                $fact_date = $fact->getDate();
+                if ($fact_date->isOK() && Date::compare($birt_date, $fact_date) <= 0 && Date::compare($fact_date, $deat_date) <= 0) {
+                    // Convert the event to a close relatives event.
+                    $rela_fact = clone($fact);
+                    $rela_fact->setTag('_' . $fact->getTag() . '_SPOU');
+                    $facts[] = $rela_fact;
+                }
+            }
+        }
+
+        return $facts;
+    }
+
+    /**
+     * Get the events of children and grandchildren.
+     *
+     * @param Individual $person
+     * @param Family     $family
+     * @param string     $option
+     * @param string     $relation
+     *
+     * @return Fact[]
+     */
+    private static function childFacts(Individual $person, Family $family, $option, $relation) {
+        global $controller;
+
+        $SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
+
+        $facts = array();
+
+        // Only include events between birth and death
+        $birt_date = $controller->record->getEstimatedBirthDate();
+        $deat_date = $controller->record->getEstimatedDeathDate();
+
+        // Deal with recursion.
+        switch ($option) {
+        case '_CHIL':
+            // Add grandchildren
+            foreach ($family->getChildren() as $child) {
+                foreach ($child->getSpouseFamilies() as $cfamily) {
+                    switch ($child->getSex()) {
+                    case 'M':
+                        foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) {
+                            $facts[] = $fact;
+                        }
+                        break;
+                    case 'F':
+                        foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) {
+                            $facts[] = $fact;
+                        }
+                        break;
+                    default:
+                        foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) {
+                            $facts[] = $fact;
+                        }
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+
+        // For each child in the family
+        foreach ($family->getChildren() as $child) {
+            if ($child->getXref() == $person->getXref()) {
+                // We are not our own sibling!
+                continue;
+            }
+            // add child’s birth
+            if (strpos($SHOW_RELATIVES_EVENTS, '_BIRT' . str_replace('_HSIB', '_SIBL', $option)) !== false) {
+                foreach ($child->getFacts(WT_EVENTS_BIRT) as $fact) {
+                    $sgdate = $fact->getDate();
+                    // Always show _BIRT_CHIL, even if the dates are not known
+                    if ($option == '_CHIL' || $sgdate->isOK() && Date::compare($birt_date, $sgdate) <= 0 && Date::compare($sgdate, $deat_date) <= 0) {
+                        if ($option == '_GCHI' && $relation == 'dau') {
+                            // Convert the event to a close relatives event.
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . '_GCH1');
+                            $facts[] = $rela_fact;
+                        } elseif ($option == '_GCHI' && $relation == 'son') {
+                            // Convert the event to a close relatives event.
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . '_GCH2');
+                            $facts[] = $rela_fact;
+                        } else {
+                            // Convert the event to a close relatives event.
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . $option);
+                            $facts[] = $rela_fact;
+                        }
+                    }
+                }
+            }
+            // add child’s death
+            if (strpos($SHOW_RELATIVES_EVENTS, '_DEAT' . str_replace('_HSIB', '_SIBL', $option)) !== false) {
+                foreach ($child->getFacts(WT_EVENTS_DEAT) as $fact) {
+                    $sgdate = $fact->getDate();
+                    if ($sgdate->isOK() && Date::compare($birt_date, $sgdate) <= 0 && Date::compare($sgdate, $deat_date) <= 0) {
+                        if ($option == '_GCHI' && $relation == 'dau') {
+                            // Convert the event to a close relatives event.
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . '_GCH1');
+                            $facts[] = $rela_fact;
+                        } elseif ($option == '_GCHI' && $relation == 'son') {
+                            // Convert the event to a close relatives event.
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . '_GCH2');
+                            $facts[] = $rela_fact;
+                        } else {
+                            // Convert the event to a close relatives event.
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . $option);
+                            $facts[] = $rela_fact;
+                        }
+                    }
+                }
+            }
+            // add child’s marriage
+            if (strstr($SHOW_RELATIVES_EVENTS, '_MARR' . str_replace('_HSIB', '_SIBL', $option))) {
+                foreach ($child->getSpouseFamilies() as $sfamily) {
+                    foreach ($sfamily->getFacts(WT_EVENTS_MARR) as $fact) {
+                        $sgdate = $fact->getDate();
+                        if ($sgdate->isOK() && Date::compare($birt_date, $sgdate) <= 0 && Date::compare($sgdate, $deat_date) <= 0) {
+                            if ($option == '_GCHI' && $relation == 'dau') {
+                                // Convert the event to a close relatives event.
+                                $rela_fact = clone($fact);
+                                $rela_fact->setTag('_' . $fact->getTag() . '_GCH1');
+                                $facts[] = $rela_fact;
+                            } elseif ($option == '_GCHI' && $relation == 'son') {
+                                // Convert the event to a close relatives event.
+                                $rela_fact = clone($fact);
+                                $rela_fact->setTag('_' . $fact->getTag() . '_GCH2');
+                                $facts[] = $rela_fact;
+                            } else {
+                                // Convert the event to a close relatives event.
+                                $rela_fact = clone($fact);
+                                $rela_fact->setTag('_' . $fact->getTag() . $option);
+                                $facts[] = $rela_fact;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $facts;
+    }
+
+    /**
+     * Get the events of parents and grandparents.
+     *
+     * @param Individual $person
+     * @param int        $sosa
+     *
+     * @return Fact[]
+     */
+    private static function parentFacts(Individual $person, $sosa) {
+        global $controller;
+
+        $SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
+
+        $facts = array();
+
+        // Only include events between birth and death
+        $birt_date = $controller->record->getEstimatedBirthDate();
+        $deat_date = $controller->record->getEstimatedDeathDate();
+
+        if ($sosa == 1) {
+            foreach ($person->getChildFamilies() as $family) {
+                // Add siblings
+                foreach (self::childFacts($person, $family, '_SIBL', '') as $fact) {
+                    $facts[] = $fact;
+                }
+                foreach ($family->getSpouses() as $spouse) {
+                    foreach ($spouse->getSpouseFamilies() as $sfamily) {
+                        if ($family !== $sfamily) {
+                            // Add half-siblings
+                            foreach (self::childFacts($person, $sfamily, '_HSIB', '') as $fact) {
+                                $facts[] = $fact;
+                            }
+                        }
+                    }
+                    // Add grandparents
+                    foreach (self::parentFacts($spouse, $spouse->getSex() == 'F' ? 3 : 2) as $fact) {
+                        $facts[] = $fact;
+                    }
+                }
+            }
+
+            if (strstr($SHOW_RELATIVES_EVENTS, '_MARR_PARE')) {
+                // add father/mother marriages
+                foreach ($person->getChildFamilies() as $sfamily) {
+                    foreach ($sfamily->getFacts(WT_EVENTS_MARR) as $fact) {
+                        if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
+                            // marriage of parents (to each other)
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . '_FAMC');
+                            $facts[] = $rela_fact;
+                        }
+                    }
+                }
+                foreach ($person->getChildStepFamilies() as $sfamily) {
+                    foreach ($sfamily->getFacts(WT_EVENTS_MARR) as $fact) {
+                        if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
+                            // marriage of a parent (to another spouse)
+                            // Convert the event to a close relatives event
+                            $rela_fact = clone($fact);
+                            $rela_fact->setTag('_' . $fact->getTag() . '_PARE');
+                            $facts[] = $rela_fact;
+                        }
+                    }
+                }
+            }
+        }
+
+        foreach ($person->getChildFamilies() as $family) {
+            foreach ($family->getSpouses() as $parent) {
+                if (strstr($SHOW_RELATIVES_EVENTS, '_DEAT' . ($sosa == 1 ? '_PARE' : '_GPAR'))) {
+                    foreach ($parent->getFacts(WT_EVENTS_DEAT) as $fact) {
+                        if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
+                            switch ($sosa) {
+                            case 1:
+                                // Convert the event to a close relatives event.
+                                $rela_fact = clone($fact);
+                                $rela_fact->setTag('_' . $fact->getTag() . '_PARE');
+                                $facts[] = $rela_fact;
+                                break;
+                            case 2:
+                                // Convert the event to a close relatives event
+                                $rela_fact = clone($fact);
+                                $rela_fact->setTag('_' . $fact->getTag() . '_GPA1');
+                                $facts[] = $rela_fact;
+                                break;
+                            case 3:
+                                // Convert the event to a close relatives event
+                                $rela_fact = clone($fact);
+                                $rela_fact->setTag('_' . $fact->getTag() . '_GPA2');
+                                $facts[] = $rela_fact;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $facts;
+    }
+
+    /**
+     * Get any historical events.
+     *
+     * @param Individual $person
+     *
+     * @return Fact[]
+     */
+    private static function historicalFacts(Individual $person) {
+        $SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
+
+        $facts = array();
+
+        if ($SHOW_RELATIVES_EVENTS) {
+            // Only include events between birth and death
+            $birt_date = $person->getEstimatedBirthDate();
+            $deat_date = $person->getEstimatedDeathDate();
+
+            if (file_exists(Site::getPreference('INDEX_DIRECTORY') . 'histo.' . WT_LOCALE . '.php')) {
+                $histo = array();
+                require Site::getPreference('INDEX_DIRECTORY') . 'histo.' . WT_LOCALE . '.php';
+                foreach ($histo as $hist) {
+                    // Earlier versions of the WIKI encouraged people to use HTML entities,
+                    // rather than UTF8 encoding.
+                    $hist = html_entity_decode($hist, ENT_QUOTES, 'UTF-8');
+
+                    $fact  = new Fact($hist, $person, 'histo');
+                    $sdate = $fact->getDate();
+                    if ($sdate->isOK() && Date::compare($birt_date, $sdate) <= 0 && Date::compare($sdate, $deat_date) <= 0) {
+                        $facts[] = $fact;
+                    }
+                }
+            }
+        }
+
+        return $facts;
+    }
+
+    /**
+     * Get the events of associates.
+     *
+     * @param Individual $person
+     *
+     * @return Fact[]
+     */
+    private static function associateFacts(Individual $person) {
+        $facts = array();
+
+        $associates = array_merge(
+            $person->linkedIndividuals('ASSO'),
+            $person->linkedIndividuals('_ASSO'),
+            $person->linkedFamilies('ASSO'),
+            $person->linkedFamilies('_ASSO')
+        );
+        foreach ($associates as $associate) {
+            foreach ($associate->getFacts() as $fact) {
+                $arec = $fact->getAttribute('_ASSO');
+                if (!$arec) {
+                    $arec = $fact->getAttribute('ASSO');
+                }
+                if ($arec && trim($arec, '@') === $person->getXref()) {
+                    // Extract the important details from the fact
+                    $factrec = '1 ' . $fact->getTag();
+                    if (preg_match('/\n2 DATE .*/', $fact->getGedcom(), $match)) {
+                        $factrec .= $match[0];
+                    }
+                    if (preg_match('/\n2 PLAC .*/', $fact->getGedcom(), $match)) {
+                        $factrec .= $match[0];
+                    }
+                    if ($associate instanceof Family) {
+                        foreach ($associate->getSpouses() as $spouse) {
+                            $factrec .= "\n2 _ASSO @" . $spouse->getXref() . '@';
+                        }
+                    } else {
+                        $factrec .= "\n2 _ASSO @" . $associate->getXref() . '@';
+                    }
+                    $facts[] = new Fact($factrec, $associate, 'asso');
+                }
+            }
+        }
+
+        return $facts;
+    }
 }

Switch Indentation +65 added lines, -65 removed lines

@@ -60,19 +60,19 @@ 
 		// The individual’s own facts
 		foreach ($controller->record->getFacts() as $fact) {
 			switch ($fact->getTag()) {
-			case 'SEX':
-			case 'NAME':
-			case 'SOUR':
-			case 'OBJE':
-			case 'NOTE':
-			case 'FAMC':
-			case 'FAMS':
-				break;
-			default:
-				if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) {
-					$indifacts[] = $fact;
-				}
-				break;
+			    case 'SEX':
+			    case 'NAME':
+			    case 'SOUR':
+			    case 'OBJE':
+			    case 'NOTE':
+			    case 'FAMC':
+			    case 'FAMS':
+				    break;
+			    default:
+				    if (!array_key_exists('extra_info', Module::getActiveSidebars($controller->record->getTree())) || !ExtraInformationModule::showFact($fact)) {
+					    $indifacts[] = $fact;
+				    }
+				    break;
 			}
 		}
 
@@ -80,19 +80,19 @@ 
 		foreach ($controller->record->getSpouseFamilies() as $family) {
 			foreach ($family->getFacts() as $fact) {
 				switch ($fact->getTag()) {
-				case 'SOUR':
-				case 'NOTE':
-				case 'OBJE':
-				case 'CHAN':
-				case '_UID':
-				case 'RIN':
-				case 'HUSB':
-				case 'WIFE':
-				case 'CHIL':
-					break;
-				default:
-					$indifacts[] = $fact;
-					break;
+				    case 'SOUR':
+				    case 'NOTE':
+				    case 'OBJE':
+				    case 'CHAN':
+				    case '_UID':
+				    case 'RIN':
+				    case 'HUSB':
+				    case 'WIFE':
+				    case 'CHIL':
+					    break;
+				    default:
+					    $indifacts[] = $fact;
+					    break;
 				}
 			}
 			$spouse = $family->getSpouse($controller->record);
@@ -239,27 +239,27 @@ 
 
 		// Deal with recursion.
 		switch ($option) {
-		case '_CHIL':
-			// Add grandchildren
-			foreach ($family->getChildren() as $child) {
-				foreach ($child->getSpouseFamilies() as $cfamily) {
-					switch ($child->getSex()) {
-					case 'M':
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					case 'F':
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					default:
-						foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) {
-							$facts[] = $fact;
-						}
-						break;
-					}
+		    case '_CHIL':
+			    // Add grandchildren
+			    foreach ($family->getChildren() as $child) {
+				    foreach ($child->getSpouseFamilies() as $cfamily) {
+					    switch ($child->getSex()) {
+					        case 'M':
+						        foreach (self::childFacts($person, $cfamily, '_GCHI', 'son') as $fact) {
+							        $facts[] = $fact;
+						        }
+						        break;
+					        case 'F':
+						        foreach (self::childFacts($person, $cfamily, '_GCHI', 'dau') as $fact) {
+							        $facts[] = $fact;
+						        }
+						        break;
+					        default:
+						        foreach (self::childFacts($person, $cfamily, '_GCHI', 'chi') as $fact) {
+							        $facts[] = $fact;
+						        }
+						        break;
+					    }
 				}
 			}
 			break;
@@ -424,24 +424,24 @@ 
 					foreach ($parent->getFacts(WT_EVENTS_DEAT) as $fact) {
 						if ($fact->getDate()->isOK() && Date::compare($birt_date, $fact->getDate()) <= 0 && Date::compare($fact->getDate(), $deat_date) <= 0) {
 							switch ($sosa) {
-							case 1:
-								// Convert the event to a close relatives event.
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_PARE');
-								$facts[] = $rela_fact;
-								break;
-							case 2:
-								// Convert the event to a close relatives event
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GPA1');
-								$facts[] = $rela_fact;
-								break;
-							case 3:
-								// Convert the event to a close relatives event
-								$rela_fact = clone($fact);
-								$rela_fact->setTag('_' . $fact->getTag() . '_GPA2');
-								$facts[] = $rela_fact;
-								break;
+							    case 1:
+								    // Convert the event to a close relatives event.
+								    $rela_fact = clone($fact);
+								    $rela_fact->setTag('_' . $fact->getTag() . '_PARE');
+								    $facts[] = $rela_fact;
+								    break;
+							    case 2:
+								    // Convert the event to a close relatives event
+								    $rela_fact = clone($fact);
+								    $rela_fact->setTag('_' . $fact->getTag() . '_GPA1');
+								    $facts[] = $rela_fact;
+								    break;
+							    case 3:
+								    // Convert the event to a close relatives event
+								    $rela_fact = clone($fact);
+								    $rela_fact->setTag('_' . $fact->getTag() . '_GPA2');
+								    $facts[] = $rela_fact;
+								    break;
 							}
 						}
 					}

Braces +28 added lines, -14 removed lines

@@ -30,29 +30,35 @@ 
 /**
  * Class IndividualFactsTabModule
  */
-class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterface {
+class IndividualFactsTabModule extends AbstractModule implements ModuleTabInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/tab on the individual page. */ I18N::translate('Facts and events');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Facts and events” module */ I18N::translate('A tab showing the facts and events of an individual.');
 	}
 
 	/** {@inheritdoc} */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 10;
 	}
 
 	/** {@inheritdoc} */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $controller;
 		$EXPAND_HISTO_EVENTS = false;
 
@@ -170,17 +176,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
 	}
 
 	/** {@inheritdoc} */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		return '';
 	}
 
@@ -192,7 +201,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	private static function spouseFacts(Individual $individual, Individual $spouse) {
+	private static function spouseFacts(Individual $individual, Individual $spouse)
+	{
 		$SHOW_RELATIVES_EVENTS = $individual->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
 
 		$facts = array();
@@ -226,7 +236,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	private static function childFacts(Individual $person, Family $family, $option, $relation) {
+	private static function childFacts(Individual $person, Family $family, $option, $relation)
+	{
 		global $controller;
 
 		$SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
@@ -359,7 +370,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	private static function parentFacts(Individual $person, $sosa) {
+	private static function parentFacts(Individual $person, $sosa)
+	{
 		global $controller;
 
 		$SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
@@ -459,7 +471,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	private static function historicalFacts(Individual $person) {
+	private static function historicalFacts(Individual $person)
+	{
 		$SHOW_RELATIVES_EVENTS = $person->getTree()->getPreference('SHOW_RELATIVES_EVENTS');
 
 		$facts = array();
@@ -496,7 +509,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	private static function associateFacts(Individual $person) {
+	private static function associateFacts(Individual $person)
+	{
 		$facts = array();
 
 		$associates = array_merge(

app/Module/ChartsBlockModule.php

Indentation +171 added lines, -171 removed lines

@@ -29,170 +29,170 @@ 
  * Class ChartsBlockModule
  */
 class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module/block */ I18N::translate('Charts');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Charts” module */ I18N::translate('An alternative way to display charts.');
-	}
-
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		global $WT_TREE, $ctype, $controller;
-
-		$PEDIGREE_ROOT_ID = $WT_TREE->getPreference('PEDIGREE_ROOT_ID');
-		$gedcomid         = $WT_TREE->getUserPreference(Auth::user(), 'gedcomid');
-
-		$details = $this->getBlockSetting($block_id, 'details', '0');
-		$type    = $this->getBlockSetting($block_id, 'type', 'pedigree');
-		$pid     = $this->getBlockSetting($block_id, 'pid', Auth::check() ? ($gedcomid ? $gedcomid : $PEDIGREE_ROOT_ID) : $PEDIGREE_ROOT_ID);
-
-		foreach (array('details', 'type', 'pid', 'block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-
-		$person = Individual::getInstance($pid, $WT_TREE);
-		if (!$person) {
-			$pid = $PEDIGREE_ROOT_ID;
-			$this->setBlockSetting($block_id, 'pid', $pid);
-			$person = Individual::getInstance($pid, $WT_TREE);
-		}
-
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		if ($ctype == 'gedcom' && Auth::isManager($WT_TREE) || $ctype == 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-		} else {
-			$title = '';
-		}
-
-		if ($person) {
-			$content = '';
-			switch ($type) {
-			case 'pedigree':
-				$title .= I18N::translate('Pedigree of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
-				$content .= '<td>';
-				ob_start();
-				FunctionsPrint::printPedigreePerson($person, $details);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printPersonPedigree($person, 1);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '</tr></table>';
-				break;
-			case 'descendants':
-				$title .= I18N::translate('Descendants of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				ob_start();
-				$chartController->printDescendency($person, 1, false);
-				$content .= ob_get_clean();
-				break;
-			case 'hourglass':
-				$title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printDescendency($person, 1, false);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printPersonPedigree($person, 1);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '</tr></table>';
-				break;
-			case 'treenav':
-				$title .= I18N::translate('Interactive tree of %s', $person->getFullName());
-				$mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
-				$tv  = new TreeView;
-				$content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
-				$content .= '<script src="' . $mod->js() . '"></script>';
-				list($html, $js) = $tv->drawViewport($person, 2);
-				$content .= $html . '<script>' . $js . '</script>';
-				break;
-			}
-		} else {
-			$content = I18N::translate('You must select an individual and a chart type in the block preferences');
-		}
-
-		if ($template) {
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		global $WT_TREE, $controller;
-
-		$PEDIGREE_ROOT_ID = $WT_TREE->getPreference('PEDIGREE_ROOT_ID');
-		$gedcomid         = $WT_TREE->getUserPreference(Auth::user(), 'gedcomid');
-
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'details', Filter::postBool('details'));
-			$this->setBlockSetting($block_id, 'type', Filter::post('type', 'pedigree|descendants|hourglass|treenav', 'pedigree'));
-			$this->setBlockSetting($block_id, 'pid', Filter::post('pid', WT_REGEX_XREF));
-		}
-
-		$details = $this->getBlockSetting($block_id, 'details', '0');
-		$type    = $this->getBlockSetting($block_id, 'type', 'pedigree');
-		$pid     = $this->getBlockSetting($block_id, 'pid', Auth::check() ? ($gedcomid ? $gedcomid : $PEDIGREE_ROOT_ID) : $PEDIGREE_ROOT_ID);
-
-		$charts = array(
-			'pedigree'    => I18N::translate('Pedigree'),
-			'descendants' => I18N::translate('Descendants'),
-			'hourglass'   => I18N::translate('Hourglass chart'),
-			'treenav'     => I18N::translate('Interactive tree'),
-		);
-		uasort($charts, 'Fisharebest\Webtrees\I18N::strcasecmp');
-
-		$controller
-			->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-			->addInlineJavascript('autocomplete();');
-	?>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module/block */ I18N::translate('Charts');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Charts” module */ I18N::translate('An alternative way to display charts.');
+    }
+
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        global $WT_TREE, $ctype, $controller;
+
+        $PEDIGREE_ROOT_ID = $WT_TREE->getPreference('PEDIGREE_ROOT_ID');
+        $gedcomid         = $WT_TREE->getUserPreference(Auth::user(), 'gedcomid');
+
+        $details = $this->getBlockSetting($block_id, 'details', '0');
+        $type    = $this->getBlockSetting($block_id, 'type', 'pedigree');
+        $pid     = $this->getBlockSetting($block_id, 'pid', Auth::check() ? ($gedcomid ? $gedcomid : $PEDIGREE_ROOT_ID) : $PEDIGREE_ROOT_ID);
+
+        foreach (array('details', 'type', 'pid', 'block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+
+        $person = Individual::getInstance($pid, $WT_TREE);
+        if (!$person) {
+            $pid = $PEDIGREE_ROOT_ID;
+            $this->setBlockSetting($block_id, 'pid', $pid);
+            $person = Individual::getInstance($pid, $WT_TREE);
+        }
+
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        if ($ctype == 'gedcom' && Auth::isManager($WT_TREE) || $ctype == 'user' && Auth::check()) {
+            $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+        } else {
+            $title = '';
+        }
+
+        if ($person) {
+            $content = '';
+            switch ($type) {
+            case 'pedigree':
+                $title .= I18N::translate('Pedigree of %s', $person->getFullName());
+                $chartController = new HourglassController($person->getXref(), $details, false);
+                $controller->addInlineJavascript($chartController->setupJavascript());
+                $content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
+                $content .= '<td>';
+                ob_start();
+                FunctionsPrint::printPedigreePerson($person, $details);
+                $content .= ob_get_clean();
+                $content .= '</td>';
+                $content .= '<td>';
+                ob_start();
+                $chartController->printPersonPedigree($person, 1);
+                $content .= ob_get_clean();
+                $content .= '</td>';
+                $content .= '</tr></table>';
+                break;
+            case 'descendants':
+                $title .= I18N::translate('Descendants of %s', $person->getFullName());
+                $chartController = new HourglassController($person->getXref(), $details, false);
+                $controller->addInlineJavascript($chartController->setupJavascript());
+                ob_start();
+                $chartController->printDescendency($person, 1, false);
+                $content .= ob_get_clean();
+                break;
+            case 'hourglass':
+                $title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
+                $chartController = new HourglassController($person->getXref(), $details, false);
+                $controller->addInlineJavascript($chartController->setupJavascript());
+                $content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
+                $content .= '<td>';
+                ob_start();
+                $chartController->printDescendency($person, 1, false);
+                $content .= ob_get_clean();
+                $content .= '</td>';
+                $content .= '<td>';
+                ob_start();
+                $chartController->printPersonPedigree($person, 1);
+                $content .= ob_get_clean();
+                $content .= '</td>';
+                $content .= '</tr></table>';
+                break;
+            case 'treenav':
+                $title .= I18N::translate('Interactive tree of %s', $person->getFullName());
+                $mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
+                $tv  = new TreeView;
+                $content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
+                $content .= '<script src="' . $mod->js() . '"></script>';
+                list($html, $js) = $tv->drawViewport($person, 2);
+                $content .= $html . '<script>' . $js . '</script>';
+                break;
+            }
+        } else {
+            $content = I18N::translate('You must select an individual and a chart type in the block preferences');
+        }
+
+        if ($template) {
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        global $WT_TREE, $controller;
+
+        $PEDIGREE_ROOT_ID = $WT_TREE->getPreference('PEDIGREE_ROOT_ID');
+        $gedcomid         = $WT_TREE->getUserPreference(Auth::user(), 'gedcomid');
+
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'details', Filter::postBool('details'));
+            $this->setBlockSetting($block_id, 'type', Filter::post('type', 'pedigree|descendants|hourglass|treenav', 'pedigree'));
+            $this->setBlockSetting($block_id, 'pid', Filter::post('pid', WT_REGEX_XREF));
+        }
+
+        $details = $this->getBlockSetting($block_id, 'details', '0');
+        $type    = $this->getBlockSetting($block_id, 'type', 'pedigree');
+        $pid     = $this->getBlockSetting($block_id, 'pid', Auth::check() ? ($gedcomid ? $gedcomid : $PEDIGREE_ROOT_ID) : $PEDIGREE_ROOT_ID);
+
+        $charts = array(
+            'pedigree'    => I18N::translate('Pedigree'),
+            'descendants' => I18N::translate('Descendants'),
+            'hourglass'   => I18N::translate('Hourglass chart'),
+            'treenav'     => I18N::translate('Interactive tree'),
+        );
+        uasort($charts, 'Fisharebest\Webtrees\I18N::strcasecmp');
+
+        $controller
+            ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+            ->addInlineJavascript('autocomplete();');
+    ?>
 		<tr>
 			<td class="descriptionbox wrap width33">
 				<?php echo I18N::translate('Chart type'); ?>
@@ -218,14 +218,14 @@ 
 			<td class="optionbox">
 				<input data-autocomplete-type="INDI" type="text" name="pid" id="pid" value="<?php echo $pid; ?>" size="5">
 				<?php
-				echo FunctionsPrint::printFindIndividualLink('pid');
-				$root = Individual::getInstance($pid, $WT_TREE);
-				if ($root) {
-					echo ' <span class="list_item">', $root->getFullName(), $root->formatFirstMajorFact(WT_EVENTS_BIRT, 1), '</span>';
-				}
-				?>
+                echo FunctionsPrint::printFindIndividualLink('pid');
+                $root = Individual::getInstance($pid, $WT_TREE);
+                if ($root) {
+                    echo ' <span class="list_item">', $root->getFullName(), $root->formatFirstMajorFact(WT_EVENTS_BIRT, 1), '</span>';
+                }
+                ?>
 			</td>
 		</tr>
 		<?php
-	}
+    }
 }

Switch Indentation +51 added lines, -51 removed lines

@@ -82,57 +82,57 @@
 		if ($person) {
 			$content = '';
 			switch ($type) {
-			case 'pedigree':
-				$title .= I18N::translate('Pedigree of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
-				$content .= '<td>';
-				ob_start();
-				FunctionsPrint::printPedigreePerson($person, $details);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printPersonPedigree($person, 1);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '</tr></table>';
-				break;
-			case 'descendants':
-				$title .= I18N::translate('Descendants of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				ob_start();
-				$chartController->printDescendency($person, 1, false);
-				$content .= ob_get_clean();
-				break;
-			case 'hourglass':
-				$title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
-				$chartController = new HourglassController($person->getXref(), $details, false);
-				$controller->addInlineJavascript($chartController->setupJavascript());
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printDescendency($person, 1, false);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '<td>';
-				ob_start();
-				$chartController->printPersonPedigree($person, 1);
-				$content .= ob_get_clean();
-				$content .= '</td>';
-				$content .= '</tr></table>';
-				break;
-			case 'treenav':
-				$title .= I18N::translate('Interactive tree of %s', $person->getFullName());
-				$mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
-				$tv  = new TreeView;
-				$content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
-				$content .= '<script src="' . $mod->js() . '"></script>';
-				list($html, $js) = $tv->drawViewport($person, 2);
-				$content .= $html . '<script>' . $js . '</script>';
-				break;
+			    case 'pedigree':
+				    $title .= I18N::translate('Pedigree of %s', $person->getFullName());
+				    $chartController = new HourglassController($person->getXref(), $details, false);
+				    $controller->addInlineJavascript($chartController->setupJavascript());
+				    $content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
+				    $content .= '<td>';
+				    ob_start();
+				    FunctionsPrint::printPedigreePerson($person, $details);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '<td>';
+				    ob_start();
+				    $chartController->printPersonPedigree($person, 1);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '</tr></table>';
+				    break;
+			    case 'descendants':
+				    $title .= I18N::translate('Descendants of %s', $person->getFullName());
+				    $chartController = new HourglassController($person->getXref(), $details, false);
+				    $controller->addInlineJavascript($chartController->setupJavascript());
+				    ob_start();
+				    $chartController->printDescendency($person, 1, false);
+				    $content .= ob_get_clean();
+				    break;
+			    case 'hourglass':
+				    $title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
+				    $chartController = new HourglassController($person->getXref(), $details, false);
+				    $controller->addInlineJavascript($chartController->setupJavascript());
+				    $content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
+				    $content .= '<td>';
+				    ob_start();
+				    $chartController->printDescendency($person, 1, false);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '<td>';
+				    ob_start();
+				    $chartController->printPersonPedigree($person, 1);
+				    $content .= ob_get_clean();
+				    $content .= '</td>';
+				    $content .= '</tr></table>';
+				    break;
+			    case 'treenav':
+				    $title .= I18N::translate('Interactive tree of %s', $person->getFullName());
+				    $mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
+				    $tv  = new TreeView;
+				    $content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
+				    $content .= '<script src="' . $mod->js() . '"></script>';
+				    list($html, $js) = $tv->drawViewport($person, 2);
+				    $content .= $html . '<script>' . $js . '</script>';
+				    break;
 			}
 		} else {
 			$content = I18N::translate('You must select an individual and a chart type in the block preferences');

Braces +16 added lines, -8 removed lines

@@ -28,14 +28,17 @@ 
 /**
  * Class ChartsBlockModule
  */
-class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface {
+class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/block */ I18N::translate('Charts');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Charts” module */ I18N::translate('An alternative way to display charts.');
 	}
 
@@ -48,7 +51,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $WT_TREE, $ctype, $controller;
 
 		$PEDIGREE_ROOT_ID = $WT_TREE->getPreference('PEDIGREE_ROOT_ID');
@@ -146,17 +150,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -165,7 +172,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		global $WT_TREE, $controller;
 
 		$PEDIGREE_ROOT_ID = $WT_TREE->getPreference('PEDIGREE_ROOT_ID');

app/Module/AlbumModule.php

Indentation +219 added lines, -219 removed lines

@@ -28,245 +28,245 @@
  * Class AlbumModule
  */
 class AlbumModule extends AbstractModule implements ModuleTabInterface {
-	/** @var Media[] List of media objects. */
-	private $media_list;
+    /** @var Media[] List of media objects. */
+    private $media_list;
 
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Album');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Album');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “Album” module */ I18N::translate('An alternative to the “media” tab, and an enhanced image viewer.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “Album” module */ I18N::translate('An alternative to the “media” tab, and an enhanced image viewer.');
+    }
 
-	/**
-	 * The user can re-arrange the tab order, but until they do, this
-	 * is the order in which tabs are shown.
-	 *
-	 * @return int
-	 */
-	public function defaultTabOrder() {
-		return 60;
-	}
+    /**
+     * The user can re-arrange the tab order, but until they do, this
+     * is the order in which tabs are shown.
+     *
+     * @return int
+     */
+    public function defaultTabOrder() {
+        return 60;
+    }
 
-	/**
-	 * Is this tab empty? If so, we don't always need to display it.
-	 *
-	 * @return bool
-	 */
-	public function hasTabContent() {
-		global $WT_TREE;
+    /**
+     * Is this tab empty? If so, we don't always need to display it.
+     *
+     * @return bool
+     */
+    public function hasTabContent() {
+        global $WT_TREE;
 
-		return Auth::isEditor($WT_TREE) || $this->getMedia();
-	}
+        return Auth::isEditor($WT_TREE) || $this->getMedia();
+    }
 
-	/**
-	 * A greyed out tab has no actual content, but may perhaps have
-	 * options to create content.
-	 *
-	 * @return bool
-	 */
-	public function isGrayedOut() {
-		return !$this->getMedia();
-	}
+    /**
+     * A greyed out tab has no actual content, but may perhaps have
+     * options to create content.
+     *
+     * @return bool
+     */
+    public function isGrayedOut() {
+        return !$this->getMedia();
+    }
 
-	/**
-	 * Generate the HTML content of this tab.
-	 *
-	 * @return string
-	 */
-	public function getTabContent() {
-		global $WT_TREE, $controller;
+    /**
+     * Generate the HTML content of this tab.
+     *
+     * @return string
+     */
+    public function getTabContent() {
+        global $WT_TREE, $controller;
 
-		$html = '<div id="' . $this->getName() . '_content">';
-		//Show Lightbox-Album header Links
-		if (Auth::isEditor($WT_TREE)) {
-			$html .= '<table class="facts_table"><tr class="noprint"><td class="descriptionbox rela">';
-			// Add a media object
-			if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
-				$html .= '<span><a href="#" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=' . $controller->record->getXref() . '\', \'_blank\', \'resizable=1,scrollbars=1,top=50,height=780,width=600\');return false;">';
-				$html .= '<img src="' . Theme::theme()->assetUrl() . 'images/image_add.png" id="head_icon" class="icon" title="' . I18N::translate('Add a media object') . '" alt="' . I18N::translate('Add a media object') . '">';
-				$html .= I18N::translate('Add a media object');
-				$html .= '</a></span>';
-				// Link to an existing item
-				$html .= '<span><a href="#" onclick="window.open(\'inverselink.php?linktoid=' . $controller->record->getXref() . '&linkto=person\', \'_blank\', \'resizable=1,scrollbars=1,top=50,height=300,width=450\');">';
-				$html .= '<img src="' . Theme::theme()->assetUrl() . 'images/image_link.png" id="head_icon" class="icon" title="' . I18N::translate('Link to an existing media object') . '" alt="' . I18N::translate('Link to an existing media object') . '">';
-				$html .= I18N::translate('Link to an existing media object');
-				$html .= '</a></span>';
-			}
-			if (Auth::isManager($WT_TREE) && $this->getMedia()) {
-				// Popup Reorder Media
-				$html .= '<span><a href="#" onclick="reorder_media(\'' . $controller->record->getXref() . '\')">';
-				$html .= '<img src="' . Theme::theme()->assetUrl() . 'images/images.png" id="head_icon" class="icon" title="' . I18N::translate('Re-order media') . '" alt="' . I18N::translate('Re-order media') . '">';
-				$html .= I18N::translate('Re-order media');
-				$html .= '</a></span>';
-			}
-			$html .= '</td></tr></table>';
-		}
+        $html = '<div id="' . $this->getName() . '_content">';
+        //Show Lightbox-Album header Links
+        if (Auth::isEditor($WT_TREE)) {
+            $html .= '<table class="facts_table"><tr class="noprint"><td class="descriptionbox rela">';
+            // Add a media object
+            if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($WT_TREE)) {
+                $html .= '<span><a href="#" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=' . $controller->record->getXref() . '\', \'_blank\', \'resizable=1,scrollbars=1,top=50,height=780,width=600\');return false;">';
+                $html .= '<img src="' . Theme::theme()->assetUrl() . 'images/image_add.png" id="head_icon" class="icon" title="' . I18N::translate('Add a media object') . '" alt="' . I18N::translate('Add a media object') . '">';
+                $html .= I18N::translate('Add a media object');
+                $html .= '</a></span>';
+                // Link to an existing item
+                $html .= '<span><a href="#" onclick="window.open(\'inverselink.php?linktoid=' . $controller->record->getXref() . '&linkto=person\', \'_blank\', \'resizable=1,scrollbars=1,top=50,height=300,width=450\');">';
+                $html .= '<img src="' . Theme::theme()->assetUrl() . 'images/image_link.png" id="head_icon" class="icon" title="' . I18N::translate('Link to an existing media object') . '" alt="' . I18N::translate('Link to an existing media object') . '">';
+                $html .= I18N::translate('Link to an existing media object');
+                $html .= '</a></span>';
+            }
+            if (Auth::isManager($WT_TREE) && $this->getMedia()) {
+                // Popup Reorder Media
+                $html .= '<span><a href="#" onclick="reorder_media(\'' . $controller->record->getXref() . '\')">';
+                $html .= '<img src="' . Theme::theme()->assetUrl() . 'images/images.png" id="head_icon" class="icon" title="' . I18N::translate('Re-order media') . '" alt="' . I18N::translate('Re-order media') . '">';
+                $html .= I18N::translate('Re-order media');
+                $html .= '</a></span>';
+            }
+            $html .= '</td></tr></table>';
+        }
 
-		// Used when sorting media on album tab page
-		$html .= '<table class="facts_table"><tr><td class="facts_value">'; // one-cell table - for presentation only
-		$html .= '<ul class="album-list">';
-		foreach ($this->getMedia() as $media) {
-			//View Edit Menu ----------------------------------
+        // Used when sorting media on album tab page
+        $html .= '<table class="facts_table"><tr><td class="facts_value">'; // one-cell table - for presentation only
+        $html .= '<ul class="album-list">';
+        foreach ($this->getMedia() as $media) {
+            //View Edit Menu ----------------------------------
 
-			//Get media item Notes
-			$haystack = $media->getGedcom();
-			$needle   = '1 NOTE';
-			$before   = substr($haystack, 0, strpos($haystack, $needle));
-			$after    = substr(strstr($haystack, $needle), strlen($needle));
-			$notes    = FunctionsPrint::printFactNotes($before . $needle . $after, 1, true);
+            //Get media item Notes
+            $haystack = $media->getGedcom();
+            $needle   = '1 NOTE';
+            $before   = substr($haystack, 0, strpos($haystack, $needle));
+            $after    = substr(strstr($haystack, $needle), strlen($needle));
+            $notes    = FunctionsPrint::printFactNotes($before . $needle . $after, 1, true);
 
-			// Prepare Below Thumbnail  menu ----------------------------------------------------
-			$menu = new Menu('<div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">' . $media->getFullName() . '</div>');
-			$menu->addClass('', 'submenu');
+            // Prepare Below Thumbnail  menu ----------------------------------------------------
+            $menu = new Menu('<div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">' . $media->getFullName() . '</div>');
+            $menu->addClass('', 'submenu');
 
-			// View Notes
-			if (strpos($media->getGedcom(), "\n1 NOTE")) {
-				$submenu = new Menu(I18N::translate('View the notes'), '#', '', array(
-					'onclick' => 'modalNotes("' . Filter::escapeJs($notes) . '","' . I18N::translate('View the notes') . '"); return false;',
-				));
-				$submenu->addClass("submenuitem");
-				$menu->addSubmenu($submenu);
-			}
-			//View Details
-			$submenu = new Menu(I18N::translate('View the details'), $media->getHtmlUrl());
-			$submenu->addClass("submenuitem");
-			$menu->addSubmenu($submenu);
+            // View Notes
+            if (strpos($media->getGedcom(), "\n1 NOTE")) {
+                $submenu = new Menu(I18N::translate('View the notes'), '#', '', array(
+                    'onclick' => 'modalNotes("' . Filter::escapeJs($notes) . '","' . I18N::translate('View the notes') . '"); return false;',
+                ));
+                $submenu->addClass("submenuitem");
+                $menu->addSubmenu($submenu);
+            }
+            //View Details
+            $submenu = new Menu(I18N::translate('View the details'), $media->getHtmlUrl());
+            $submenu->addClass("submenuitem");
+            $menu->addSubmenu($submenu);
 
-			//View Sources
-			foreach ($media->getFacts('SOUR') as $source_fact) {
-				$source = $source_fact->getTarget();
-				if ($source && $source->canShow()) {
-					$submenu = new Menu(I18N::translate('Source') . ' – ' . $source->getFullName(), $source->getHtmlUrl());
-					$submenu->addClass('submenuitem');
-					$menu->addSubmenu($submenu);
-				}
-			}
+            //View Sources
+            foreach ($media->getFacts('SOUR') as $source_fact) {
+                $source = $source_fact->getTarget();
+                if ($source && $source->canShow()) {
+                    $submenu = new Menu(I18N::translate('Source') . ' – ' . $source->getFullName(), $source->getHtmlUrl());
+                    $submenu->addClass('submenuitem');
+                    $menu->addSubmenu($submenu);
+                }
+            }
 
-			if (Auth::isEditor($media->getTree())) {
-				// Edit Media
-				$submenu = new Menu(I18N::translate('Edit the media object'), '#', '', array(
-					'onclick' => 'return window.open("addmedia.php?action=editmedia&pid=' . $media->getXref() . '", "_blank", edit_window_specs);',
-				));
-				$submenu->addClass("submenuitem");
-				$menu->addSubmenu($submenu);
-				if (Auth::isAdmin()) {
-					if (Module::getModuleByName('GEDFact_assistant')) {
-						$submenu = new Menu(I18N::translate('Manage the links'), '#', '', array(
-							'onclick' => 'return window.open("inverselink.php?mediaid=' . $media->getXref() . '&linkto=manage", "_blank", find_window_specs);',
-						));
-						$submenu->addClass("submenuitem");
-						$menu->addSubmenu($submenu);
-					} else {
-						$submenu = new Menu(I18N::translate('Link this media object to an individual'), '#', 'menu-obje-link-indi', array(
-							'onclick' => 'return ilinkitem("' . $media->getXref() . '","person");',
-						));
-						$submenu->addClass('submenuitem');
-						$menu->addSubmenu($submenu);
+            if (Auth::isEditor($media->getTree())) {
+                // Edit Media
+                $submenu = new Menu(I18N::translate('Edit the media object'), '#', '', array(
+                    'onclick' => 'return window.open("addmedia.php?action=editmedia&pid=' . $media->getXref() . '", "_blank", edit_window_specs);',
+                ));
+                $submenu->addClass("submenuitem");
+                $menu->addSubmenu($submenu);
+                if (Auth::isAdmin()) {
+                    if (Module::getModuleByName('GEDFact_assistant')) {
+                        $submenu = new Menu(I18N::translate('Manage the links'), '#', '', array(
+                            'onclick' => 'return window.open("inverselink.php?mediaid=' . $media->getXref() . '&linkto=manage", "_blank", find_window_specs);',
+                        ));
+                        $submenu->addClass("submenuitem");
+                        $menu->addSubmenu($submenu);
+                    } else {
+                        $submenu = new Menu(I18N::translate('Link this media object to an individual'), '#', 'menu-obje-link-indi', array(
+                            'onclick' => 'return ilinkitem("' . $media->getXref() . '","person");',
+                        ));
+                        $submenu->addClass('submenuitem');
+                        $menu->addSubmenu($submenu);
 
-						$submenu = new Menu(I18N::translate('Link this media object to a family'), '#', 'menu-obje-link-fam', array(
-							'onclick' => 'return ilinkitem("' . $media->getXref() . '","family");',
-						));
-						$submenu->addClass('submenuitem');
-						$menu->addSubmenu($submenu);
+                        $submenu = new Menu(I18N::translate('Link this media object to a family'), '#', 'menu-obje-link-fam', array(
+                            'onclick' => 'return ilinkitem("' . $media->getXref() . '","family");',
+                        ));
+                        $submenu->addClass('submenuitem');
+                        $menu->addSubmenu($submenu);
 
-						$submenu = new Menu(I18N::translate('Link this media object to a source'), '#', 'menu-obje-link-sour', array(
-							'onclick' => 'return ilinkitem("' . $media->getXref() . '","source");',
-						));
-						$submenu->addClass('submenuitem');
-						$menu->addSubmenu($submenu);
-					}
-					$submenu = new Menu(I18N::translate('Unlink the media object'), '#', '', array(
-						'onclick' => 'return unlink_media("' . I18N::translate('Are you sure you want to remove links to this media object?') . '", "' . $controller->record->getXref() . '", "' . $media->getXref() . '");',
-					));
-					$submenu->addClass("submenuitem");
-					$menu->addSubmenu($submenu);
-				}
-			}
-			$html .= '<li class="album-list-item">';
-			$html .= '<div class="album-image">' . $media->displayImage() . '</div>';
-			$html .= '<div class="album-title">' . $menu->getMenu() . '</div>';
-			$html .= '</li>';
-		}
-		$html .= '</ul>';
-		$html .= '</td></tr></table>';
+                        $submenu = new Menu(I18N::translate('Link this media object to a source'), '#', 'menu-obje-link-sour', array(
+                            'onclick' => 'return ilinkitem("' . $media->getXref() . '","source");',
+                        ));
+                        $submenu->addClass('submenuitem');
+                        $menu->addSubmenu($submenu);
+                    }
+                    $submenu = new Menu(I18N::translate('Unlink the media object'), '#', '', array(
+                        'onclick' => 'return unlink_media("' . I18N::translate('Are you sure you want to remove links to this media object?') . '", "' . $controller->record->getXref() . '", "' . $media->getXref() . '");',
+                    ));
+                    $submenu->addClass("submenuitem");
+                    $menu->addSubmenu($submenu);
+                }
+            }
+            $html .= '<li class="album-list-item">';
+            $html .= '<div class="album-image">' . $media->displayImage() . '</div>';
+            $html .= '<div class="album-title">' . $menu->getMenu() . '</div>';
+            $html .= '</li>';
+        }
+        $html .= '</ul>';
+        $html .= '</td></tr></table>';
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Get all facts containing media links for this person and their spouse-family records
-	 *
-	 * @return Media[]
-	 */
-	private function getMedia() {
-		global $controller;
+    /**
+     * Get all facts containing media links for this person and their spouse-family records
+     *
+     * @return Media[]
+     */
+    private function getMedia() {
+        global $controller;
 
-		if ($this->media_list === null) {
-			// Use facts from this individual and all their spouses
-			$facts = $controller->record->getFacts();
-			foreach ($controller->record->getSpouseFamilies() as $family) {
-				foreach ($family->getFacts() as $fact) {
-					$facts[] = $fact;
-				}
-			}
-			// Use all media from each fact
-			$this->media_list = array();
-			foreach ($facts as $fact) {
-				// Don't show pending edits, as the user just sees duplicates
-				if (!$fact->isPendingDeletion()) {
-					preg_match_all('/(?:^1|\n\d) OBJE @(' . WT_REGEX_XREF . ')@/', $fact->getGedcom(), $matches);
-					foreach ($matches[1] as $match) {
-						$media = Media::getInstance($match, $controller->record->getTree());
-						if ($media && $media->canShow()) {
-							$this->media_list[] = $media;
-						}
-					}
-				}
-			}
-			// If a media object is linked twice, only show it once
-			$this->media_list = array_unique($this->media_list);
-			// Sort these using _WT_OBJE_SORT
-			$wt_obje_sort = array();
-			foreach ($controller->record->getFacts('_WT_OBJE_SORT') as $fact) {
-				$wt_obje_sort[] = trim($fact->getValue(), '@');
-			}
-			usort($this->media_list, function (Media $x, Media $y) use ($wt_obje_sort) {
-				return array_search($x->getXref(), $wt_obje_sort) - array_search($y->getXref(), $wt_obje_sort);
-			});
-		}
+        if ($this->media_list === null) {
+            // Use facts from this individual and all their spouses
+            $facts = $controller->record->getFacts();
+            foreach ($controller->record->getSpouseFamilies() as $family) {
+                foreach ($family->getFacts() as $fact) {
+                    $facts[] = $fact;
+                }
+            }
+            // Use all media from each fact
+            $this->media_list = array();
+            foreach ($facts as $fact) {
+                // Don't show pending edits, as the user just sees duplicates
+                if (!$fact->isPendingDeletion()) {
+                    preg_match_all('/(?:^1|\n\d) OBJE @(' . WT_REGEX_XREF . ')@/', $fact->getGedcom(), $matches);
+                    foreach ($matches[1] as $match) {
+                        $media = Media::getInstance($match, $controller->record->getTree());
+                        if ($media && $media->canShow()) {
+                            $this->media_list[] = $media;
+                        }
+                    }
+                }
+            }
+            // If a media object is linked twice, only show it once
+            $this->media_list = array_unique($this->media_list);
+            // Sort these using _WT_OBJE_SORT
+            $wt_obje_sort = array();
+            foreach ($controller->record->getFacts('_WT_OBJE_SORT') as $fact) {
+                $wt_obje_sort[] = trim($fact->getValue(), '@');
+            }
+            usort($this->media_list, function (Media $x, Media $y) use ($wt_obje_sort) {
+                return array_search($x->getXref(), $wt_obje_sort) - array_search($y->getXref(), $wt_obje_sort);
+            });
+        }
 
-		return $this->media_list;
-	}
+        return $this->media_list;
+    }
 
-	/**
-	 * Can this tab load asynchronously?
-	 *
-	 * @return bool
-	 */
-	public function canLoadAjax() {
-		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
-	}
+    /**
+     * Can this tab load asynchronously?
+     *
+     * @return bool
+     */
+    public function canLoadAjax() {
+        return !Auth::isSearchEngine(); // Search engines cannot use AJAX
+    }
 
-	/**
-	 * Any content (e.g. Javascript) that needs to be rendered before the tabs.
-	 *
-	 * This function is probably not needed, as there are better ways to achieve this.
-	 *
-	 * @return string
-	 */
-	public function getPreLoadContent() {
-		return '';
-	}
+    /**
+     * Any content (e.g. Javascript) that needs to be rendered before the tabs.
+     *
+     * This function is probably not needed, as there are better ways to achieve this.
+     *
+     * @return string
+     */
+    public function getPreLoadContent() {
+        return '';
+    }
 }

Braces +20 added lines, -10 removed lines

@@ -27,7 +27,8 @@ 
 /**
  * Class AlbumModule
  */
-class AlbumModule extends AbstractModule implements ModuleTabInterface {
+class AlbumModule extends AbstractModule implements ModuleTabInterface
+{
 	/** @var Media[] List of media objects. */
 	private $media_list;
 
@@ -36,7 +37,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Album');
 	}
 
@@ -45,7 +47,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Album” module */ I18N::translate('An alternative to the “media” tab, and an enhanced image viewer.');
 	}
 
@@ -55,7 +58,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 60;
 	}
 
@@ -64,7 +68,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		global $WT_TREE;
 
 		return Auth::isEditor($WT_TREE) || $this->getMedia();
@@ -76,7 +81,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		return !$this->getMedia();
 	}
 
@@ -85,7 +91,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $WT_TREE, $controller;
 
 		$html = '<div id="' . $this->getName() . '_content">';
@@ -210,7 +217,8 @@ 
 	 *
 	 * @return Media[]
 	 */
-	private function getMedia() {
+	private function getMedia()
+	{
 		global $controller;
 
 		if ($this->media_list === null) {
@@ -255,7 +263,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
 	}
 
@@ -266,7 +275,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		return '';
 	}
 }

app/Module/FactSourcesReportModule.php

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
  * Class FactSourcesReportModule
  */
 class FactSourcesReportModule extends AbstractModule implements ModuleReportInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Name of a module/report */ I18N::translate('Source');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a module/report */ I18N::translate('Source');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Source” module */ I18N::translate('A report of the information provided by a source.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Description of the “Source” module */ I18N::translate('A report of the information provided by a source.');
+    }
 
-	/**
-	 * What is the default access level for this module?
-	 *
-	 * Some modules are aimed at admins or managers, and are not generally shown to users.
-	 *
-	 * @return int
-	 */
-	public function defaultAccessLevel() {
-		return Auth::PRIV_USER;
-	}
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_USER;
+    }
 
-	/**
-	 * Return a menu item for this report.
-	 *
-	 * @return Menu
-	 */
-	public function getReportMenu() {
-		global $WT_TREE;
+    /**
+     * Return a menu item for this report.
+     *
+     * @return Menu
+     */
+    public function getReportMenu() {
+        global $WT_TREE;
 
-		return new Menu(
-			$this->getTitle(),
-			'reportengine.php?ged=' . $WT_TREE->getNameUrl() . '&action=setup&report=' . WT_MODULES_DIR . $this->getName() . '/report.xml',
-			'menu-report-' . $this->getName(),
-			array('rel' => 'nofollow')
-		);
-	}
+        return new Menu(
+            $this->getTitle(),
+            'reportengine.php?ged=' . $WT_TREE->getNameUrl() . '&action=setup&report=' . WT_MODULES_DIR . $this->getName() . '/report.xml',
+            'menu-report-' . $this->getName(),
+            array('rel' => 'nofollow')
+        );
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class FactSourcesReportModule
  */
-class FactSourcesReportModule extends AbstractModule implements ModuleReportInterface {
+class FactSourcesReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report */ I18N::translate('Source');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Source” module */ I18N::translate('A report of the information provided by a source.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_USER;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $WT_TREE;
 
 		return new Menu(

app/Module/TimelineChartModule.php

Indentation +47 added lines, -47 removed lines

@@ -24,55 +24,55 @@
  * Class TimelineChartModule
  */
 class TimelineChartModule extends AbstractModule implements ModuleChartInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module/chart */ I18N::translate('Timeline');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module/chart */ I18N::translate('Timeline');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “TimelineChart” module */ I18N::translate('A timeline displaying individual events.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “TimelineChart” module */ I18N::translate('A timeline displaying individual events.');
+    }
 
-	/**
-	 * What is the default access level for this module?
-	 *
-	 * Some modules are aimed at admins or managers, and are not generally shown to users.
-	 *
-	 * @return int
-	 */
-	public function defaultAccessLevel() {
-		return Auth::PRIV_PRIVATE;
-	}
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_PRIVATE;
+    }
 
-	/**
-	 * Return a menu item for this chart.
-	 *
-	 * @return Menu|null
-	 */
-	public function getChartMenu(Individual $individual) {
-		return new Menu(
-			$this->getTitle(),
-			'timeline.php?pids%5B%5D=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
-			'menu-chart-timeline',
-			array('rel' => 'nofollow')
-		);
-	}
+    /**
+     * Return a menu item for this chart.
+     *
+     * @return Menu|null
+     */
+    public function getChartMenu(Individual $individual) {
+        return new Menu(
+            $this->getTitle(),
+            'timeline.php?pids%5B%5D=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+            'menu-chart-timeline',
+            array('rel' => 'nofollow')
+        );
+    }
 
-	/**
-	 * Return a menu item for this chart - for use in individual boxes.
-	 *
-	 * @return Menu|null
-	 */
-	public function getBoxChartMenu(Individual $individual) {
-		return null;
-	}
+    /**
+     * Return a menu item for this chart - for use in individual boxes.
+     *
+     * @return Menu|null
+     */
+    public function getBoxChartMenu(Individual $individual) {
+        return null;
+    }
 }

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class TimelineChartModule
  */
-class TimelineChartModule extends AbstractModule implements ModuleChartInterface {
+class TimelineChartModule extends AbstractModule implements ModuleChartInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Timeline');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “TimelineChart” module */ I18N::translate('A timeline displaying individual events.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -58,7 +62,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'timeline.php?pids%5B%5D=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return null;
 	}
 }

app/Module/FamilyTreeFavoritesModule.php

Indentation +296 added lines, -296 removed lines

@@ -35,327 +35,327 @@
  * logic works for both.
  */
 class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInterface {
-	// How to update the database schema for this module
-	const SCHEMA_TARGET_VERSION   = 4;
-	const SCHEMA_SETTING_NAME     = 'FV_SCHEMA_VERSION';
-	const SCHEMA_MIGRATION_PREFIX = '\Fisharebest\Webtrees\Module\FamilyTreeFavorites\Schema';
+    // How to update the database schema for this module
+    const SCHEMA_TARGET_VERSION   = 4;
+    const SCHEMA_SETTING_NAME     = 'FV_SCHEMA_VERSION';
+    const SCHEMA_MIGRATION_PREFIX = '\Fisharebest\Webtrees\Module\FamilyTreeFavorites\Schema';
 
-	/**
-	 * Create a new module.
-	 *
-	 * @param string $directory Where is this module installed
-	 */
-	public function __construct($directory) {
-		parent::__construct($directory);
+    /**
+     * Create a new module.
+     *
+     * @param string $directory Where is this module installed
+     */
+    public function __construct($directory) {
+        parent::__construct($directory);
 
-		// Create/update the database tables.
-		// NOTE: if we want to set any module-settings, we'll need to move this.
-		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
-	}
+        // Create/update the database tables.
+        // NOTE: if we want to set any module-settings, we'll need to move this.
+        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+    }
 
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Favorites');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Favorites');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “Favorites” module */ I18N::translate('Display and manage a family tree’s favorite pages.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “Favorites” module */ I18N::translate('Display and manage a family tree’s favorite pages.');
+    }
 
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		global $ctype, $controller, $WT_TREE;
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        global $ctype, $controller, $WT_TREE;
 
-		$action = Filter::get('action');
-		switch ($action) {
-		case 'deletefav':
-			$favorite_id = Filter::getInteger('favorite_id');
-			if ($favorite_id) {
-				self::deleteFavorite($favorite_id);
-			}
-			break;
-		case 'addfav':
-			$gid      = Filter::get('gid', WT_REGEX_XREF);
-			$favnote  = Filter::get('favnote');
-			$url      = Filter::getUrl('url');
-			$favtitle = Filter::get('favtitle');
+        $action = Filter::get('action');
+        switch ($action) {
+        case 'deletefav':
+            $favorite_id = Filter::getInteger('favorite_id');
+            if ($favorite_id) {
+                self::deleteFavorite($favorite_id);
+            }
+            break;
+        case 'addfav':
+            $gid      = Filter::get('gid', WT_REGEX_XREF);
+            $favnote  = Filter::get('favnote');
+            $url      = Filter::getUrl('url');
+            $favtitle = Filter::get('favtitle');
 
-			if ($gid) {
-				$record = GedcomRecord::getInstance($gid, $WT_TREE);
-				if ($record && $record->canShow()) {
-					self::addFavorite(array(
-						'user_id'   => $ctype === 'user' ? Auth::id() : null,
-						'gedcom_id' => $WT_TREE->getTreeId(),
-						'gid'       => $record->getXref(),
-						'type'      => $record::RECORD_TYPE,
-						'url'       => null,
-						'note'      => $favnote,
-						'title'     => $favtitle,
-					));
-				}
-			} elseif ($url) {
-				self::addFavorite(array(
-					'user_id'   => $ctype === 'user' ? Auth::id() : null,
-					'gedcom_id' => $WT_TREE->getTreeId(),
-					'gid'       => null,
-					'type'      => 'URL',
-					'url'       => $url,
-					'note'      => $favnote,
-					'title'     => $favtitle ? $favtitle : $url,
-				));
-			}
-			break;
-		}
+            if ($gid) {
+                $record = GedcomRecord::getInstance($gid, $WT_TREE);
+                if ($record && $record->canShow()) {
+                    self::addFavorite(array(
+                        'user_id'   => $ctype === 'user' ? Auth::id() : null,
+                        'gedcom_id' => $WT_TREE->getTreeId(),
+                        'gid'       => $record->getXref(),
+                        'type'      => $record::RECORD_TYPE,
+                        'url'       => null,
+                        'note'      => $favnote,
+                        'title'     => $favtitle,
+                    ));
+                }
+            } elseif ($url) {
+                self::addFavorite(array(
+                    'user_id'   => $ctype === 'user' ? Auth::id() : null,
+                    'gedcom_id' => $WT_TREE->getTreeId(),
+                    'gid'       => null,
+                    'type'      => 'URL',
+                    'url'       => $url,
+                    'note'      => $favnote,
+                    'title'     => $favtitle ? $favtitle : $url,
+                ));
+            }
+            break;
+        }
 
-		$block = $this->getBlockSetting($block_id, 'block', '0');
+        $block = $this->getBlockSetting($block_id, 'block', '0');
 
-		foreach (array('block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
+        foreach (array('block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
 
-		$userfavs = $this->getFavorites($ctype === 'user' ? Auth::id() : $WT_TREE->getTreeId());
-		if (!is_array($userfavs)) {
-			$userfavs = array();
-		}
+        $userfavs = $this->getFavorites($ctype === 'user' ? Auth::id() : $WT_TREE->getTreeId());
+        if (!is_array($userfavs)) {
+            $userfavs = array();
+        }
 
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		$title = $this->getTitle();
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        $title = $this->getTitle();
 
-		if (Auth::check()) {
-			$controller
-				->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-				->addInlineJavascript('autocomplete();');
-		}
+        if (Auth::check()) {
+            $controller
+                ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+                ->addInlineJavascript('autocomplete();');
+        }
 
-		$content = '';
-		if ($userfavs) {
-			foreach ($userfavs as $key => $favorite) {
-				if (isset($favorite['id'])) {
-					$key = $favorite['id'];
-				}
-				$removeFavourite = '<a class="font9" href="index.php?ctype=' . $ctype . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;action=deletefav&amp;favorite_id=' . $key . '" onclick="return confirm(\'' . I18N::translate('Are you sure you want to remove this item from your list of favorites?') . '\');">' . I18N::translate('Remove') . '</a> ';
-				if ($favorite['type'] == 'URL') {
-					$content .= '<div id="boxurl' . $key . '.0" class="person_box">';
-					if ($ctype == 'user' || Auth::isManager($WT_TREE)) {
-						$content .= $removeFavourite;
-					}
-					$content .= '<a href="' . $favorite['url'] . '"><b>' . $favorite['title'] . '</b></a>';
-					$content .= '<br>' . $favorite['note'];
-					$content .= '</div>';
-				} else {
-					$record = GedcomRecord::getInstance($favorite['gid'], $WT_TREE);
-					if ($record && $record->canShow()) {
-						if ($record instanceof Individual) {
-							$content .= '<div id="box' . $favorite["gid"] . '.0" class="person_box action_header';
-							switch ($record->getSex()) {
-							case 'M':
-								break;
-							case 'F':
-								$content .= 'F';
-								break;
-							default:
-								$content .= 'NN';
-								break;
-							}
-							$content .= '">';
-							if ($ctype == "user" || Auth::isManager($WT_TREE)) {
-								$content .= $removeFavourite;
-							}
-							$content .= Theme::theme()->individualBoxLarge($record);
-							$content .= $favorite['note'];
-							$content .= '</div>';
-						} else {
-							$content .= '<div id="box' . $favorite['gid'] . '.0" class="person_box">';
-							if ($ctype == 'user' || Auth::isManager($WT_TREE)) {
-								$content .= $removeFavourite;
-							}
-							$content .= $record->formatList('span');
-							$content .= '<br>' . $favorite['note'];
-							$content .= '</div>';
-						}
-					}
-				}
-			}
-		}
-		if ($ctype == 'user' || Auth::isManager($WT_TREE)) {
-			$uniqueID = Uuid::uuid4(); // This block can theoretically appear multiple times, so use a unique ID.
-			$content .= '<div class="add_fav_head">';
-			$content .= '<a href="#" onclick="return expand_layer(\'add_fav' . $uniqueID . '\');">' . I18N::translate('Add a favorite') . '<i id="add_fav' . $uniqueID . '_img" class="icon-plus"></i></a>';
-			$content .= '</div>';
-			$content .= '<div id="add_fav' . $uniqueID . '" style="display: none;">';
-			$content .= '<form name="addfavform" method="get" action="index.php">';
-			$content .= '<input type="hidden" name="action" value="addfav">';
-			$content .= '<input type="hidden" name="ctype" value="' . $ctype . '">';
-			$content .= '<input type="hidden" name="ged" value="' . $WT_TREE->getNameHtml() . '">';
-			$content .= '<div class="add_fav_ref">';
-			$content .= '<input type="radio" name="fav_category" value="record" checked onclick="jQuery(\'#gid' . $uniqueID . '\').removeAttr(\'disabled\'); jQuery(\'#url, #favtitle\').attr(\'disabled\',\'disabled\').val(\'\');">';
-			$content .= '<label for="gid' . $uniqueID . '">' . I18N::translate('Enter an individual, family, or source ID') . '</label>';
-			$content .= '<input class="pedigree_form" data-autocomplete-type="IFSRO" type="text" name="gid" id="gid' . $uniqueID . '" size="5" value="">';
-			$content .= ' ' . FunctionsPrint::printFindIndividualLink('gid' . $uniqueID);
-			$content .= ' ' . FunctionsPrint::printFindFamilyLink('gid' . $uniqueID);
-			$content .= ' ' . FunctionsPrint::printFindSourceLink('gid' . $uniqueID);
-			$content .= ' ' . FunctionsPrint::printFindRepositoryLink('gid' . $uniqueID);
-			$content .= ' ' . FunctionsPrint::printFindNoteLink('gid' . $uniqueID);
-			$content .= ' ' . FunctionsPrint::printFindMediaLink('gid' . $uniqueID);
-			$content .= '</div>';
-			$content .= '<div class="add_fav_url">';
-			$content .= '<input type="radio" name="fav_category" value="url" onclick="jQuery(\'#url, #favtitle\').removeAttr(\'disabled\'); jQuery(\'#gid' . $uniqueID . '\').attr(\'disabled\',\'disabled\').val(\'\');">';
-			$content .= '<input type="text" name="url" id="url" size="20" value="" placeholder="' . GedcomTag::getLabel('URL') . '" disabled> ';
-			$content .= '<input type="text" name="favtitle" id="favtitle" size="20" value="" placeholder="' . I18N::translate('Title') . '" disabled>';
-			$content .= '<p>' . I18N::translate('Enter an optional note about this favorite') . '</p>';
-			$content .= '<textarea name="favnote" rows="6" cols="50"></textarea>';
-			$content .= '</div>';
-			$content .= '<input type="submit" value="' . /* I18N: A button label. */ I18N::translate('add') . '">';
-			$content .= '</form></div>';
-		}
+        $content = '';
+        if ($userfavs) {
+            foreach ($userfavs as $key => $favorite) {
+                if (isset($favorite['id'])) {
+                    $key = $favorite['id'];
+                }
+                $removeFavourite = '<a class="font9" href="index.php?ctype=' . $ctype . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;action=deletefav&amp;favorite_id=' . $key . '" onclick="return confirm(\'' . I18N::translate('Are you sure you want to remove this item from your list of favorites?') . '\');">' . I18N::translate('Remove') . '</a> ';
+                if ($favorite['type'] == 'URL') {
+                    $content .= '<div id="boxurl' . $key . '.0" class="person_box">';
+                    if ($ctype == 'user' || Auth::isManager($WT_TREE)) {
+                        $content .= $removeFavourite;
+                    }
+                    $content .= '<a href="' . $favorite['url'] . '"><b>' . $favorite['title'] . '</b></a>';
+                    $content .= '<br>' . $favorite['note'];
+                    $content .= '</div>';
+                } else {
+                    $record = GedcomRecord::getInstance($favorite['gid'], $WT_TREE);
+                    if ($record && $record->canShow()) {
+                        if ($record instanceof Individual) {
+                            $content .= '<div id="box' . $favorite["gid"] . '.0" class="person_box action_header';
+                            switch ($record->getSex()) {
+                            case 'M':
+                                break;
+                            case 'F':
+                                $content .= 'F';
+                                break;
+                            default:
+                                $content .= 'NN';
+                                break;
+                            }
+                            $content .= '">';
+                            if ($ctype == "user" || Auth::isManager($WT_TREE)) {
+                                $content .= $removeFavourite;
+                            }
+                            $content .= Theme::theme()->individualBoxLarge($record);
+                            $content .= $favorite['note'];
+                            $content .= '</div>';
+                        } else {
+                            $content .= '<div id="box' . $favorite['gid'] . '.0" class="person_box">';
+                            if ($ctype == 'user' || Auth::isManager($WT_TREE)) {
+                                $content .= $removeFavourite;
+                            }
+                            $content .= $record->formatList('span');
+                            $content .= '<br>' . $favorite['note'];
+                            $content .= '</div>';
+                        }
+                    }
+                }
+            }
+        }
+        if ($ctype == 'user' || Auth::isManager($WT_TREE)) {
+            $uniqueID = Uuid::uuid4(); // This block can theoretically appear multiple times, so use a unique ID.
+            $content .= '<div class="add_fav_head">';
+            $content .= '<a href="#" onclick="return expand_layer(\'add_fav' . $uniqueID . '\');">' . I18N::translate('Add a favorite') . '<i id="add_fav' . $uniqueID . '_img" class="icon-plus"></i></a>';
+            $content .= '</div>';
+            $content .= '<div id="add_fav' . $uniqueID . '" style="display: none;">';
+            $content .= '<form name="addfavform" method="get" action="index.php">';
+            $content .= '<input type="hidden" name="action" value="addfav">';
+            $content .= '<input type="hidden" name="ctype" value="' . $ctype . '">';
+            $content .= '<input type="hidden" name="ged" value="' . $WT_TREE->getNameHtml() . '">';
+            $content .= '<div class="add_fav_ref">';
+            $content .= '<input type="radio" name="fav_category" value="record" checked onclick="jQuery(\'#gid' . $uniqueID . '\').removeAttr(\'disabled\'); jQuery(\'#url, #favtitle\').attr(\'disabled\',\'disabled\').val(\'\');">';
+            $content .= '<label for="gid' . $uniqueID . '">' . I18N::translate('Enter an individual, family, or source ID') . '</label>';
+            $content .= '<input class="pedigree_form" data-autocomplete-type="IFSRO" type="text" name="gid" id="gid' . $uniqueID . '" size="5" value="">';
+            $content .= ' ' . FunctionsPrint::printFindIndividualLink('gid' . $uniqueID);
+            $content .= ' ' . FunctionsPrint::printFindFamilyLink('gid' . $uniqueID);
+            $content .= ' ' . FunctionsPrint::printFindSourceLink('gid' . $uniqueID);
+            $content .= ' ' . FunctionsPrint::printFindRepositoryLink('gid' . $uniqueID);
+            $content .= ' ' . FunctionsPrint::printFindNoteLink('gid' . $uniqueID);
+            $content .= ' ' . FunctionsPrint::printFindMediaLink('gid' . $uniqueID);
+            $content .= '</div>';
+            $content .= '<div class="add_fav_url">';
+            $content .= '<input type="radio" name="fav_category" value="url" onclick="jQuery(\'#url, #favtitle\').removeAttr(\'disabled\'); jQuery(\'#gid' . $uniqueID . '\').attr(\'disabled\',\'disabled\').val(\'\');">';
+            $content .= '<input type="text" name="url" id="url" size="20" value="" placeholder="' . GedcomTag::getLabel('URL') . '" disabled> ';
+            $content .= '<input type="text" name="favtitle" id="favtitle" size="20" value="" placeholder="' . I18N::translate('Title') . '" disabled>';
+            $content .= '<p>' . I18N::translate('Enter an optional note about this favorite') . '</p>';
+            $content .= '<textarea name="favnote" rows="6" cols="50"></textarea>';
+            $content .= '</div>';
+            $content .= '<input type="submit" value="' . /* I18N: A button label. */ I18N::translate('add') . '">';
+            $content .= '</form></div>';
+        }
 
-		if ($template) {
-			if ($block) {
-				$class .= ' small_inner_block';
-			}
+        if ($template) {
+            if ($block) {
+                $class .= ' small_inner_block';
+            }
 
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
 
-	/**
-	 * Should this block load asynchronously using AJAX?
-	 *
-	 * Simple blocks are faster in-line, more comples ones
-	 * can be loaded later.
-	 *
-	 * @return bool
-	 */
-	public function loadAjax() {
-		return false;
-	}
+    /**
+     * Should this block load asynchronously using AJAX?
+     *
+     * Simple blocks are faster in-line, more comples ones
+     * can be loaded later.
+     *
+     * @return bool
+     */
+    public function loadAjax() {
+        return false;
+    }
 
-	/**
-	 * Can this block be shown on the user’s home page?
-	 *
-	 * @return bool
-	 */
-	public function isUserBlock() {
-		return false;
-	}
+    /**
+     * Can this block be shown on the user’s home page?
+     *
+     * @return bool
+     */
+    public function isUserBlock() {
+        return false;
+    }
 
-	/**
-	 * Can this block be shown on the tree’s home page?
-	 *
-	 * @return bool
-	 */
-	public function isGedcomBlock() {
-		return true;
-	}
+    /**
+     * Can this block be shown on the tree’s home page?
+     *
+     * @return bool
+     */
+    public function isGedcomBlock() {
+        return true;
+    }
 
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
-		}
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
+        }
 
-		$block = $this->getBlockSetting($block_id, 'block', '0');
+        $block = $this->getBlockSetting($block_id, 'block', '0');
 
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('block', $block);
-		echo '</td></tr>';
-	}
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('block', $block);
+        echo '</td></tr>';
+    }
 
-	/**
-	 * Delete a favorite from the database
-	 *
-	 * @param int $favorite_id
-	 *
-	 * @return bool
-	 */
-	public static function deleteFavorite($favorite_id) {
-		return (bool)
-			Database::prepare("DELETE FROM `##favorite` WHERE favorite_id=?")
-			->execute(array($favorite_id));
-	}
+    /**
+     * Delete a favorite from the database
+     *
+     * @param int $favorite_id
+     *
+     * @return bool
+     */
+    public static function deleteFavorite($favorite_id) {
+        return (bool)
+            Database::prepare("DELETE FROM `##favorite` WHERE favorite_id=?")
+            ->execute(array($favorite_id));
+    }
 
-	/**
-	 * Store a new favorite in the database
-	 *
-	 * @param $favorite
-	 *
-	 * @return bool
-	 */
-	public static function addFavorite($favorite) {
-		// -- make sure a favorite is added
-		if (empty($favorite['gid']) && empty($favorite['url'])) {
-			return false;
-		}
+    /**
+     * Store a new favorite in the database
+     *
+     * @param $favorite
+     *
+     * @return bool
+     */
+    public static function addFavorite($favorite) {
+        // -- make sure a favorite is added
+        if (empty($favorite['gid']) && empty($favorite['url'])) {
+            return false;
+        }
 
-		//-- make sure this is not a duplicate entry
-		$sql = "SELECT 1 FROM `##favorite` WHERE";
-		if (!empty($favorite['gid'])) {
-			$sql .= " xref=?";
-			$vars = array($favorite['gid']);
-		} else {
-			$sql .= " url=?";
-			$vars = array($favorite['url']);
-		}
-		$sql .= " AND gedcom_id=?";
-		$vars[] = $favorite['gedcom_id'];
-		if ($favorite['user_id']) {
-			$sql .= " AND user_id=?";
-			$vars[] = $favorite['user_id'];
-		} else {
-			$sql .= " AND user_id IS NULL";
-		}
+        //-- make sure this is not a duplicate entry
+        $sql = "SELECT 1 FROM `##favorite` WHERE";
+        if (!empty($favorite['gid'])) {
+            $sql .= " xref=?";
+            $vars = array($favorite['gid']);
+        } else {
+            $sql .= " url=?";
+            $vars = array($favorite['url']);
+        }
+        $sql .= " AND gedcom_id=?";
+        $vars[] = $favorite['gedcom_id'];
+        if ($favorite['user_id']) {
+            $sql .= " AND user_id=?";
+            $vars[] = $favorite['user_id'];
+        } else {
+            $sql .= " AND user_id IS NULL";
+        }
 
-		if (Database::prepare($sql)->execute($vars)->fetchOne()) {
-			return false;
-		}
+        if (Database::prepare($sql)->execute($vars)->fetchOne()) {
+            return false;
+        }
 
-		//-- add the favorite to the database
-		return (bool)
-			Database::prepare("INSERT INTO `##favorite` (user_id, gedcom_id, xref, favorite_type, url, title, note) VALUES (? ,? ,? ,? ,? ,? ,?)")
-				->execute(array($favorite['user_id'], $favorite['gedcom_id'], $favorite['gid'], $favorite['type'], $favorite['url'], $favorite['title'], $favorite['note']));
-	}
+        //-- add the favorite to the database
+        return (bool)
+            Database::prepare("INSERT INTO `##favorite` (user_id, gedcom_id, xref, favorite_type, url, title, note) VALUES (? ,? ,? ,? ,? ,? ,?)")
+                ->execute(array($favorite['user_id'], $favorite['gedcom_id'], $favorite['gid'], $favorite['type'], $favorite['url'], $favorite['title'], $favorite['note']));
+    }
 
-	/**
-	 * Get favorites for a user or family tree
-	 *
-	 * @param int $gedcom_id
-	 *
-	 * @return string[][]
-	 */
-	public static function getFavorites($gedcom_id) {
-		return
-			Database::prepare(
-				"SELECT favorite_id AS id, user_id, gedcom_id, xref AS gid, favorite_type AS type, title, note, url" .
-				" FROM `##favorite` WHERE gedcom_id=? AND user_id IS NULL")
-			->execute(array($gedcom_id))
-			->fetchAll(PDO::FETCH_ASSOC);
-	}
+    /**
+     * Get favorites for a user or family tree
+     *
+     * @param int $gedcom_id
+     *
+     * @return string[][]
+     */
+    public static function getFavorites($gedcom_id) {
+        return
+            Database::prepare(
+                "SELECT favorite_id AS id, user_id, gedcom_id, xref AS gid, favorite_type AS type, title, note, url" .
+                " FROM `##favorite` WHERE gedcom_id=? AND user_id IS NULL")
+            ->execute(array($gedcom_id))
+            ->fetchAll(PDO::FETCH_ASSOC);
+    }
 }

Switch Indentation +44 added lines, -44 removed lines

@@ -85,43 +85,43 @@ 
 
 		$action = Filter::get('action');
 		switch ($action) {
-		case 'deletefav':
-			$favorite_id = Filter::getInteger('favorite_id');
-			if ($favorite_id) {
-				self::deleteFavorite($favorite_id);
-			}
-			break;
-		case 'addfav':
-			$gid      = Filter::get('gid', WT_REGEX_XREF);
-			$favnote  = Filter::get('favnote');
-			$url      = Filter::getUrl('url');
-			$favtitle = Filter::get('favtitle');
+		    case 'deletefav':
+			    $favorite_id = Filter::getInteger('favorite_id');
+			    if ($favorite_id) {
+				    self::deleteFavorite($favorite_id);
+			    }
+			    break;
+		    case 'addfav':
+			    $gid      = Filter::get('gid', WT_REGEX_XREF);
+			    $favnote  = Filter::get('favnote');
+			    $url      = Filter::getUrl('url');
+			    $favtitle = Filter::get('favtitle');
 
-			if ($gid) {
-				$record = GedcomRecord::getInstance($gid, $WT_TREE);
-				if ($record && $record->canShow()) {
-					self::addFavorite(array(
-						'user_id'   => $ctype === 'user' ? Auth::id() : null,
-						'gedcom_id' => $WT_TREE->getTreeId(),
-						'gid'       => $record->getXref(),
-						'type'      => $record::RECORD_TYPE,
-						'url'       => null,
-						'note'      => $favnote,
-						'title'     => $favtitle,
-					));
-				}
-			} elseif ($url) {
-				self::addFavorite(array(
-					'user_id'   => $ctype === 'user' ? Auth::id() : null,
-					'gedcom_id' => $WT_TREE->getTreeId(),
-					'gid'       => null,
-					'type'      => 'URL',
-					'url'       => $url,
-					'note'      => $favnote,
-					'title'     => $favtitle ? $favtitle : $url,
-				));
-			}
-			break;
+			    if ($gid) {
+				    $record = GedcomRecord::getInstance($gid, $WT_TREE);
+				    if ($record && $record->canShow()) {
+					    self::addFavorite(array(
+						    'user_id'   => $ctype === 'user' ? Auth::id() : null,
+						    'gedcom_id' => $WT_TREE->getTreeId(),
+						    'gid'       => $record->getXref(),
+						    'type'      => $record::RECORD_TYPE,
+						    'url'       => null,
+						    'note'      => $favnote,
+						    'title'     => $favtitle,
+					    ));
+				    }
+			    } elseif ($url) {
+				    self::addFavorite(array(
+					    'user_id'   => $ctype === 'user' ? Auth::id() : null,
+					    'gedcom_id' => $WT_TREE->getTreeId(),
+					    'gid'       => null,
+					    'type'      => 'URL',
+					    'url'       => $url,
+					    'note'      => $favnote,
+					    'title'     => $favtitle ? $favtitle : $url,
+				    ));
+			    }
+			    break;
 		}
 
 		$block = $this->getBlockSetting($block_id, 'block', '0');
@@ -168,14 +168,14 @@ 
 						if ($record instanceof Individual) {
 							$content .= '<div id="box' . $favorite["gid"] . '.0" class="person_box action_header';
 							switch ($record->getSex()) {
-							case 'M':
-								break;
-							case 'F':
-								$content .= 'F';
-								break;
-							default:
-								$content .= 'NN';
-								break;
+							    case 'M':
+								    break;
+							    case 'F':
+								    $content .= 'F';
+								    break;
+							    default:
+								    $content .= 'NN';
+								    break;
 							}
 							$content .= '">';
 							if ($ctype == "user" || Auth::isManager($WT_TREE)) {

Braces +24 added lines, -12 removed lines

@@ -34,7 +34,8 @@ 
  * Note that the user favorites module simply extends this module, so ensure that the
  * logic works for both.
  */
-class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInterface {
+class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInterface
+{
 	// How to update the database schema for this module
 	const SCHEMA_TARGET_VERSION   = 4;
 	const SCHEMA_SETTING_NAME     = 'FV_SCHEMA_VERSION';
@@ -45,7 +46,8 @@ 
 	 *
 	 * @param string $directory Where is this module installed
 	 */
-	public function __construct($directory) {
+	public function __construct($directory)
+	{
 		parent::__construct($directory);
 
 		// Create/update the database tables.
@@ -58,7 +60,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Favorites');
 	}
 
@@ -67,7 +70,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Favorites” module */ I18N::translate('Display and manage a family tree’s favorite pages.');
 	}
 
@@ -80,7 +84,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $ctype, $controller, $WT_TREE;
 
 		$action = Filter::get('action');
@@ -248,7 +253,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return false;
 	}
 
@@ -257,7 +263,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return false;
 	}
 
@@ -266,7 +273,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -275,7 +283,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
 		}
@@ -296,7 +305,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function deleteFavorite($favorite_id) {
+	public static function deleteFavorite($favorite_id)
+	{
 		return (bool)
 			Database::prepare("DELETE FROM `##favorite` WHERE favorite_id=?")
 			->execute(array($favorite_id));
@@ -309,7 +319,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function addFavorite($favorite) {
+	public static function addFavorite($favorite)
+	{
 		// -- make sure a favorite is added
 		if (empty($favorite['gid']) && empty($favorite['url'])) {
 			return false;
@@ -350,7 +361,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public static function getFavorites($gedcom_id) {
+	public static function getFavorites($gedcom_id)
+	{
 		return
 			Database::prepare(
 				"SELECT favorite_id AS id, user_id, gedcom_id, xref AS gid, favorite_type AS type, title, note, url" .

app/Module/ClippingsCartModule.php

Indentation +391 added lines, -391 removed lines

@@ -32,80 +32,80 @@ 
  * Class ClippingsCartModule
  */
 class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, ModuleSidebarInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */
-			I18N::translate('Clippings cart');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Clippings cart” module */
-			I18N::translate('Select records from your family tree and save them as a GEDCOM file.');
-	}
-
-	/**
-	 * What is the default access level for this module?
-	 *
-	 * Some modules are aimed at admins or managers, and are not generally shown to users.
-	 *
-	 * @return int
-	 */
-	public function defaultAccessLevel() {
-		return Auth::PRIV_USER;
-	}
-
-	/**
-	 * 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;
-
-		// Only allow access if either the menu or sidebar is enabled.
-		if (
-			!array_key_exists($this->getName(), Module::getActiveSidebars($WT_TREE)) &&
-			!array_key_exists($this->getName(), Module::getActiveMenus($WT_TREE))
-		) {
-			http_response_code(404);
-
-			return;
-		}
-
-		switch ($mod_action) {
-		case 'ajax':
-			$html = $this->getSidebarAjaxContent();
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $html;
-			break;
-		case 'index':
-			global $controller, $WT_TREE;
-
-			$MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
-
-			$clip_ctrl = new ClippingsCartController;
-			$cart      = Session::get('cart');
-
-			$controller = new PageController;
-			$controller
-				->setPageTitle($this->getTitle())
-				->pageHeader()
-				->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-				->addInlineJavascript('autocomplete();');
-
-			echo '<script>';
-			echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
-			echo '</script>';
-
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
-			}
-
-			if ($clip_ctrl->action == 'add') {
-				$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
-				if ($clip_ctrl->type === 'FAM') { ?>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */
+            I18N::translate('Clippings cart');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Clippings cart” module */
+            I18N::translate('Select records from your family tree and save them as a GEDCOM file.');
+    }
+
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_USER;
+    }
+
+    /**
+     * 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;
+
+        // Only allow access if either the menu or sidebar is enabled.
+        if (
+            !array_key_exists($this->getName(), Module::getActiveSidebars($WT_TREE)) &&
+            !array_key_exists($this->getName(), Module::getActiveMenus($WT_TREE))
+        ) {
+            http_response_code(404);
+
+            return;
+        }
+
+        switch ($mod_action) {
+        case 'ajax':
+            $html = $this->getSidebarAjaxContent();
+            header('Content-Type: text/html; charset=UTF-8');
+            echo $html;
+            break;
+        case 'index':
+            global $controller, $WT_TREE;
+
+            $MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
+
+            $clip_ctrl = new ClippingsCartController;
+            $cart      = Session::get('cart');
+
+            $controller = new PageController;
+            $controller
+                ->setPageTitle($this->getTitle())
+                ->pageHeader()
+                ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+                ->addInlineJavascript('autocomplete();');
+
+            echo '<script>';
+            echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
+            echo '</script>';
+
+            if (!$cart[$WT_TREE->getTreeId()]) {
+                echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
+            }
+
+            if ($clip_ctrl->action == 'add') {
+                $record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
+                if ($clip_ctrl->type === 'FAM') { ?>
 					<form action="module.php" method="get">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -131,14 +131,14 @@ 
 									<td class="optionbox">
 										<input type="radio" name="others" value="members" checked>
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their children', $record->getFullName()); ?>
+                                        I18N::translate('%s and their children', $record->getFullName()); ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="optionbox">
 										<input type="radio" name="others" value="descendants">
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their descendants', $record->getFullName()); ?>
+                                        I18N::translate('%s and their descendants', $record->getFullName()); ?>
 									</td>
 								</tr>
 							</tbody>
@@ -179,14 +179,14 @@ 
 										<label>
 											<input type="radio" name="others" value="parents">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her parents and siblings', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his parents and siblings', $record->getFullName());
-											}
-											?>
+                                            if ($record->getSex() === 'F') {
+                                                echo /* I18N: %s is a woman's name */
+                                                I18N::translate('%s, her parents and siblings', $record->getFullName());
+                                            } else {
+                                                echo /* I18N: %s is a man's name */
+                                                I18N::translate('%s, his parents and siblings', $record->getFullName());
+                                            }
+                                            ?>
 										</label>
 									</td>
 								</tr>
@@ -195,14 +195,14 @@ 
 										<label>
 											<input type="radio" name="others" value="members">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and children', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and children', $record->getFullName());
-											}
-											?>
+                                            if ($record->getSex() === 'F') {
+                                                echo /* I18N: %s is a woman's name */
+                                                I18N::translate('%s, her spouses and children', $record->getFullName());
+                                            } else {
+                                                echo /* I18N: %s is a man's name */
+                                                I18N::translate('%s, his spouses and children', $record->getFullName());
+                                            }
+                                            ?>
 										</label>
 									</td>
 								</tr>
@@ -211,14 +211,14 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestors" id="ancestors">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s and her ancestors', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s and his ancestors', $record->getFullName());
-											}
-											?>
+                                            if ($record->getSex() === 'F') {
+                                                echo /* I18N: %s is a woman's name */
+                                                I18N::translate('%s and her ancestors', $record->getFullName());
+                                            } else {
+                                                echo /* I18N: %s is a man's name */
+                                                I18N::translate('%s and his ancestors', $record->getFullName());
+                                            }
+                                            ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
@@ -230,14 +230,14 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her ancestors and their families', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his ancestors and their families', $record->getFullName());
-											}
-											?>
+                                            if ($record->getSex() === 'F') {
+                                                echo /* I18N: %s is a woman's name */
+                                                I18N::translate('%s, her ancestors and their families', $record->getFullName());
+                                            } else {
+                                                echo /* I18N: %s is a man's name */
+                                                I18N::translate('%s, his ancestors and their families', $record->getFullName());
+                                            }
+                                            ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
@@ -249,14 +249,14 @@ 
 										<label>
 											<input type="radio" name="others" value="descendants" id="descendants">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and descendants', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and descendants', $record->getFullName());
-											}
-											?>
+                                            if ($record->getSex() === 'F') {
+                                                echo /* I18N: %s is a woman's name */
+                                                I18N::translate('%s, her spouses and descendants', $record->getFullName());
+                                            } else {
+                                                echo /* I18N: %s is a man's name */
+                                                I18N::translate('%s, his spouses and descendants', $record->getFullName());
+                                            }
+                                            ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
@@ -302,7 +302,7 @@ 
 										<label>
 											<input type="radio" name="others" value="linked">
 											<?php echo /* I18N: %s is the name of a source */
-											I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
+                                            I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
 										</label>
 									</td>
 								</tr>
@@ -317,12 +317,12 @@ 
 						</table>
 					</form>
 				<?php }
-			}
+            }
 
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				if ($clip_ctrl->action != 'add') {
-					echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
-					?>
+            if (!$cart[$WT_TREE->getTreeId()]) {
+                if ($clip_ctrl->action != 'add') {
+                    echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
+                    ?>
 					<form method="get" name="addin" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -351,16 +351,16 @@ 
 						</table>
 					</form>
 					<?php
-				}
+                }
 
-				// -- end new lines
-				echo I18N::translate('Your clippings cart is empty.');
-			} else {
-				// Keep track of the INDI from the parent page, otherwise it will
-				// get lost after ajax updates
-				$pid = Filter::get('pid', WT_REGEX_XREF);
+                // -- end new lines
+                echo I18N::translate('Your clippings cart is empty.');
+            } else {
+                // Keep track of the INDI from the parent page, otherwise it will
+                // get lost after ajax updates
+                $pid = Filter::get('pid', WT_REGEX_XREF);
 
-				if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
+                if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
 					<form method="get" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -500,265 +500,265 @@ 
 					</thead>
 					<tbody>
 						<?php
-						foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
-							$record = GedcomRecord::getInstance($xref, $WT_TREE);
-							if ($record) {
-								switch ($record::RECORD_TYPE) {
-								case 'INDI':
-									$icon = 'icon-indis';
-									break;
-								case 'FAM':
-									$icon = 'icon-sfamily';
-									break;
-								case 'SOUR':
-									$icon = 'icon-source';
-									break;
-								case 'REPO':
-									$icon = 'icon-repository';
-									break;
-								case 'NOTE':
-									$icon = 'icon-note';
-									break;
-								case 'OBJE':
-									$icon = 'icon-media';
-									break;
-								default:
-									$icon = 'icon-clippings';
-									break;
-								}
-								?>
+                        foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
+                            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+                            if ($record) {
+                                switch ($record::RECORD_TYPE) {
+                                case 'INDI':
+                                    $icon = 'icon-indis';
+                                    break;
+                                case 'FAM':
+                                    $icon = 'icon-sfamily';
+                                    break;
+                                case 'SOUR':
+                                    $icon = 'icon-source';
+                                    break;
+                                case 'REPO':
+                                    $icon = 'icon-repository';
+                                    break;
+                                case 'NOTE':
+                                    $icon = 'icon-note';
+                                    break;
+                                case 'OBJE':
+                                    $icon = 'icon-media';
+                                    break;
+                                default:
+                                    $icon = 'icon-clippings';
+                                    break;
+                                }
+                                ?>
 								<tr>
 									<td class="list_value">
 										<i class="<?php echo $icon; ?>"></i>
 										<?php
-										echo '<a href="', $record->getHtmlUrl(), '">', $record->getFullName(), '</a>';
-										?>
+                                        echo '<a href="', $record->getHtmlUrl(), '">', $record->getFullName(), '</a>';
+                                        ?>
 									</td>
 									<td class="list_value center vmiddle"><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=remove&amp;id=<?php echo $xref; ?>" class="icon-remove" title="<?php echo I18N::translate('Remove'); ?>"></a></td>
 								</tr>
 								<?php
-							}
-						}
-						?>
+                            }
+                        }
+                        ?>
 				</table>
 				<?php
-			}
-			break;
-		default:
-			http_response_code(404);
-			break;
-		}
-	}
-
-	/**
-	 * The user can re-order menus. Until they do, they are shown in this order.
-	 *
-	 * @return int
-	 */
-	public function defaultMenuOrder() {
-		return 20;
-	}
-
-	/**
-	 * A menu, to be added to the main application menu.
-	 *
-	 * @return Menu|null
-	 */
-	public function getMenu() {
-		global $controller, $WT_TREE;
-
-		$submenus = array();
-		if (isset($controller->record)) {
-			$submenus[] = new Menu($this->getTitle(), 'module.php?mod=clippings&amp;mod_action=index&amp;ged=' . $WT_TREE->getNameUrl(), 'menu-clippingscart', array('rel' => 'nofollow'));
-		}
-		if (!empty($controller->record) && $controller->record->canShow()) {
-			$submenus[] = new Menu(I18N::translate('Add to the clippings cart'), 'module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id=' . $controller->record->getXref(), 'menu-clippingsadd', array('rel' => 'nofollow'));
-		}
-
-		if ($submenus) {
-			return new Menu($this->getTitle(), '#', 'menu-clippings', array('rel' => 'nofollow'), $submenus);
-		} else {
-			return new Menu($this->getTitle(), 'module.php?mod=clippings&amp;mod_action=index&amp;ged=' . $WT_TREE->getNameUrl(), 'menu-clippings', array('rel' => 'nofollow'));
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
-		return 60;
-	}
-
-	/** {@inheritdoc} */
-	public function hasSidebarContent() {
-		// Creating a controller has the side effect of initialising the cart
-		new ClippingsCartController;
-
-		return true;
-	}
-
-	/**
-	 * Load this sidebar synchronously.
-	 *
-	 * @return string
-	 */
-	public function getSidebarContent() {
-		global $controller;
-
-		$controller->addInlineJavascript('
+            }
+            break;
+        default:
+            http_response_code(404);
+            break;
+        }
+    }
+
+    /**
+     * The user can re-order menus. Until they do, they are shown in this order.
+     *
+     * @return int
+     */
+    public function defaultMenuOrder() {
+        return 20;
+    }
+
+    /**
+     * A menu, to be added to the main application menu.
+     *
+     * @return Menu|null
+     */
+    public function getMenu() {
+        global $controller, $WT_TREE;
+
+        $submenus = array();
+        if (isset($controller->record)) {
+            $submenus[] = new Menu($this->getTitle(), 'module.php?mod=clippings&amp;mod_action=index&amp;ged=' . $WT_TREE->getNameUrl(), 'menu-clippingscart', array('rel' => 'nofollow'));
+        }
+        if (!empty($controller->record) && $controller->record->canShow()) {
+            $submenus[] = new Menu(I18N::translate('Add to the clippings cart'), 'module.php?mod=clippings&amp;mod_action=index&amp;action=add&amp;id=' . $controller->record->getXref(), 'menu-clippingsadd', array('rel' => 'nofollow'));
+        }
+
+        if ($submenus) {
+            return new Menu($this->getTitle(), '#', 'menu-clippings', array('rel' => 'nofollow'), $submenus);
+        } else {
+            return new Menu($this->getTitle(), 'module.php?mod=clippings&amp;mod_action=index&amp;ged=' . $WT_TREE->getNameUrl(), 'menu-clippings', array('rel' => 'nofollow'));
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function defaultSidebarOrder() {
+        return 60;
+    }
+
+    /** {@inheritdoc} */
+    public function hasSidebarContent() {
+        // Creating a controller has the side effect of initialising the cart
+        new ClippingsCartController;
+
+        return true;
+    }
+
+    /**
+     * Load this sidebar synchronously.
+     *
+     * @return string
+     */
+    public function getSidebarContent() {
+        global $controller;
+
+        $controller->addInlineJavascript('
 				jQuery("#sb_clippings_content").on("click", ".add_cart, .remove_cart", function() {
 					jQuery("#sb_clippings_content").load(this.href);
 					return false;
 				});
 			');
 
-		return '<div id="sb_clippings_content">' . $this->getCartList() . '</div>';
-	}
-
-	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
-		global $WT_TREE;
-
-		$cart = Session::get('cart');
-
-		$clip_ctrl         = new ClippingsCartController;
-		$add               = Filter::get('add', WT_REGEX_XREF);
-		$add1              = Filter::get('add1', WT_REGEX_XREF);
-		$remove            = Filter::get('remove', WT_REGEX_XREF);
-		$others            = Filter::get('others');
-		$clip_ctrl->level1 = Filter::getInteger('level1');
-		$clip_ctrl->level2 = Filter::getInteger('level2');
-		$clip_ctrl->level3 = Filter::getInteger('level3');
-		if ($add) {
-			$record = GedcomRecord::getInstance($add, $WT_TREE);
-			if ($record) {
-				$clip_ctrl->id   = $record->getXref();
-				$clip_ctrl->type = $record::RECORD_TYPE;
-				$clip_ctrl->addClipping($record);
-			}
-		} elseif ($add1) {
-			$record = Individual::getInstance($add1, $WT_TREE);
-			if ($record) {
-				$clip_ctrl->id   = $record->getXref();
-				$clip_ctrl->type = $record::RECORD_TYPE;
-				if ($others == 'parents') {
-					foreach ($record->getChildFamilies() as $family) {
-						$clip_ctrl->addClipping($family);
-						$clip_ctrl->addFamilyMembers($family);
-					}
-				} elseif ($others == 'ancestors') {
-					$clip_ctrl->addAncestorsToCart($record, $clip_ctrl->level1);
-				} elseif ($others == 'ancestorsfamilies') {
-					$clip_ctrl->addAncestorsToCartFamilies($record, $clip_ctrl->level2);
-				} elseif ($others == 'members') {
-					foreach ($record->getSpouseFamilies() as $family) {
-						$clip_ctrl->addClipping($family);
-						$clip_ctrl->addFamilyMembers($family);
-					}
-				} elseif ($others == 'descendants') {
-					foreach ($record->getSpouseFamilies() as $family) {
-						$clip_ctrl->addClipping($family);
-						$clip_ctrl->addFamilyDescendancy($family, $clip_ctrl->level3);
-					}
-				}
-			}
-		} elseif ($remove) {
-			unset($cart[$WT_TREE->getTreeId()][$remove]);
-			Session::put('cart', $cart);
-		} elseif (isset($_REQUEST['empty'])) {
-			$cart[$WT_TREE->getTreeId()] = array();
-			Session::put('cart', $cart);
-		} elseif (isset($_REQUEST['download'])) {
-			return $this->downloadForm($clip_ctrl);
-		}
-
-		return $this->getCartList();
-	}
-
-	/**
-	 * A list for the side bar.
-	 *
-	 * @return string
-	 */
-	public function getCartList() {
-		global $WT_TREE;
-
-		$cart = Session::get('cart', array());
-		if (!array_key_exists($WT_TREE->getTreeId(), $cart)) {
-			$cart[$WT_TREE->getTreeId()] = array();
-		}
-		$pid = Filter::get('pid', WT_REGEX_XREF);
-
-		if (!$cart[$WT_TREE->getTreeId()]) {
-			$out = I18N::translate('Your clippings cart is empty.');
-		} else {
-			$out = '<ul>';
-			foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
-				$record = GedcomRecord::getInstance($xref, $WT_TREE);
-				if ($record instanceof Individual || $record instanceof Family) {
-					switch ($record::RECORD_TYPE) {
-					case 'INDI':
-						$icon = 'icon-indis';
-						break;
-					case 'FAM':
-						$icon = 'icon-sfamily';
-						break;
-					}
-					$out .= '<li>';
-					if (!empty($icon)) {
-						$out .= '<i class="' . $icon . '"></i>';
-					}
-					$out .= '<a href="' . $record->getHtmlUrl() . '">';
-					if ($record instanceof Individual) {
-						$out .= $record->getSexImage();
-					}
-					$out .= ' ' . $record->getFullName() . ' ';
-					if ($record instanceof Individual && $record->canShow()) {
-						$out .= ' (' . $record->getLifeSpan() . ')';
-					}
-					$out .= '</a>';
-					$out .= '<a class="icon-remove remove_cart" href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;remove=' . $xref . '&amp;pid=' . $pid . '" title="' . I18N::translate('Remove') . '"></a>';
-					$out .= '</li>';
-				}
-			}
-			$out .= '</ul>';
-		}
-
-		if ($cart[$WT_TREE->getTreeId()]) {
-			$out .=
-				'<br><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;empty=true&amp;pid=' . $pid . '" class="remove_cart">' .
-				I18N::translate('Empty the clippings cart') .
-				'</a>' .
-				'<br>' .
-				'<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;download=true&amp;pid=' . $pid . '" class="add_cart">' .
-				I18N::translate('Download') .
-				'</a>';
-		}
-		$record = Individual::getInstance($pid, $WT_TREE);
-		if ($record && !array_key_exists($record->getXref(), $cart[$WT_TREE->getTreeId()])) {
-			$out .= '<br><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;action=add1&amp;type=INDI&amp;id=' . $pid . '&amp;pid=' . $pid . '" class="add_cart"><i class="icon-clippings"></i> ' . I18N::translate('Add %s to the clippings cart', $record->getFullName()) . '</a>';
-		}
-
-		return $out;
-	}
-
-	/**
-	 * A form to choose the download options.
-	 *
-	 * @param ClippingsCartController $clip_ctrl
-	 *
-	 * @return string
-	 */
-	public function downloadForm(ClippingsCartController $clip_ctrl) {
-		global $WT_TREE;
-
-		$pid = Filter::get('pid', WT_REGEX_XREF);
-
-		$out = '<script>';
-		$out .= 'function cancelDownload() {
+        return '<div id="sb_clippings_content">' . $this->getCartList() . '</div>';
+    }
+
+    /** {@inheritdoc} */
+    public function getSidebarAjaxContent() {
+        global $WT_TREE;
+
+        $cart = Session::get('cart');
+
+        $clip_ctrl         = new ClippingsCartController;
+        $add               = Filter::get('add', WT_REGEX_XREF);
+        $add1              = Filter::get('add1', WT_REGEX_XREF);
+        $remove            = Filter::get('remove', WT_REGEX_XREF);
+        $others            = Filter::get('others');
+        $clip_ctrl->level1 = Filter::getInteger('level1');
+        $clip_ctrl->level2 = Filter::getInteger('level2');
+        $clip_ctrl->level3 = Filter::getInteger('level3');
+        if ($add) {
+            $record = GedcomRecord::getInstance($add, $WT_TREE);
+            if ($record) {
+                $clip_ctrl->id   = $record->getXref();
+                $clip_ctrl->type = $record::RECORD_TYPE;
+                $clip_ctrl->addClipping($record);
+            }
+        } elseif ($add1) {
+            $record = Individual::getInstance($add1, $WT_TREE);
+            if ($record) {
+                $clip_ctrl->id   = $record->getXref();
+                $clip_ctrl->type = $record::RECORD_TYPE;
+                if ($others == 'parents') {
+                    foreach ($record->getChildFamilies() as $family) {
+                        $clip_ctrl->addClipping($family);
+                        $clip_ctrl->addFamilyMembers($family);
+                    }
+                } elseif ($others == 'ancestors') {
+                    $clip_ctrl->addAncestorsToCart($record, $clip_ctrl->level1);
+                } elseif ($others == 'ancestorsfamilies') {
+                    $clip_ctrl->addAncestorsToCartFamilies($record, $clip_ctrl->level2);
+                } elseif ($others == 'members') {
+                    foreach ($record->getSpouseFamilies() as $family) {
+                        $clip_ctrl->addClipping($family);
+                        $clip_ctrl->addFamilyMembers($family);
+                    }
+                } elseif ($others == 'descendants') {
+                    foreach ($record->getSpouseFamilies() as $family) {
+                        $clip_ctrl->addClipping($family);
+                        $clip_ctrl->addFamilyDescendancy($family, $clip_ctrl->level3);
+                    }
+                }
+            }
+        } elseif ($remove) {
+            unset($cart[$WT_TREE->getTreeId()][$remove]);
+            Session::put('cart', $cart);
+        } elseif (isset($_REQUEST['empty'])) {
+            $cart[$WT_TREE->getTreeId()] = array();
+            Session::put('cart', $cart);
+        } elseif (isset($_REQUEST['download'])) {
+            return $this->downloadForm($clip_ctrl);
+        }
+
+        return $this->getCartList();
+    }
+
+    /**
+     * A list for the side bar.
+     *
+     * @return string
+     */
+    public function getCartList() {
+        global $WT_TREE;
+
+        $cart = Session::get('cart', array());
+        if (!array_key_exists($WT_TREE->getTreeId(), $cart)) {
+            $cart[$WT_TREE->getTreeId()] = array();
+        }
+        $pid = Filter::get('pid', WT_REGEX_XREF);
+
+        if (!$cart[$WT_TREE->getTreeId()]) {
+            $out = I18N::translate('Your clippings cart is empty.');
+        } else {
+            $out = '<ul>';
+            foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
+                $record = GedcomRecord::getInstance($xref, $WT_TREE);
+                if ($record instanceof Individual || $record instanceof Family) {
+                    switch ($record::RECORD_TYPE) {
+                    case 'INDI':
+                        $icon = 'icon-indis';
+                        break;
+                    case 'FAM':
+                        $icon = 'icon-sfamily';
+                        break;
+                    }
+                    $out .= '<li>';
+                    if (!empty($icon)) {
+                        $out .= '<i class="' . $icon . '"></i>';
+                    }
+                    $out .= '<a href="' . $record->getHtmlUrl() . '">';
+                    if ($record instanceof Individual) {
+                        $out .= $record->getSexImage();
+                    }
+                    $out .= ' ' . $record->getFullName() . ' ';
+                    if ($record instanceof Individual && $record->canShow()) {
+                        $out .= ' (' . $record->getLifeSpan() . ')';
+                    }
+                    $out .= '</a>';
+                    $out .= '<a class="icon-remove remove_cart" href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;remove=' . $xref . '&amp;pid=' . $pid . '" title="' . I18N::translate('Remove') . '"></a>';
+                    $out .= '</li>';
+                }
+            }
+            $out .= '</ul>';
+        }
+
+        if ($cart[$WT_TREE->getTreeId()]) {
+            $out .=
+                '<br><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;empty=true&amp;pid=' . $pid . '" class="remove_cart">' .
+                I18N::translate('Empty the clippings cart') .
+                '</a>' .
+                '<br>' .
+                '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;download=true&amp;pid=' . $pid . '" class="add_cart">' .
+                I18N::translate('Download') .
+                '</a>';
+        }
+        $record = Individual::getInstance($pid, $WT_TREE);
+        if ($record && !array_key_exists($record->getXref(), $cart[$WT_TREE->getTreeId()])) {
+            $out .= '<br><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;action=add1&amp;type=INDI&amp;id=' . $pid . '&amp;pid=' . $pid . '" class="add_cart"><i class="icon-clippings"></i> ' . I18N::translate('Add %s to the clippings cart', $record->getFullName()) . '</a>';
+        }
+
+        return $out;
+    }
+
+    /**
+     * A form to choose the download options.
+     *
+     * @param ClippingsCartController $clip_ctrl
+     *
+     * @return string
+     */
+    public function downloadForm(ClippingsCartController $clip_ctrl) {
+        global $WT_TREE;
+
+        $pid = Filter::get('pid', WT_REGEX_XREF);
+
+        $out = '<script>';
+        $out .= 'function cancelDownload() {
 				var link = "module.php?mod=' . $this->getName() . '&mod_action=ajax&pid=' . $pid . '";
 				jQuery("#sb_clippings_content").load(link);
 			}';
-		$out .= '</script>';
-		$out .= '<form method="get" action="module.php">
+        $out .= '</script>';
+        $out .= '<form method="get" action="module.php">
 		<input type="hidden" name="mod" value="clippings">
 		<input type="hidden" name="mod_action" value="index">
 		<input type="hidden" name="pid" value="' . $pid . '">
@@ -772,25 +772,25 @@ 
 		<td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes" checked></td></tr>
 		';
 
-		if (Auth::isManager($WT_TREE)) {
-			$out .=
-				'<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' .
-				'<td class="optionbox">' .
-				'<input type="radio" name="privatize_export" value="none" checked> ' . I18N::translate('None') . '<br>' .
-				'<input type="radio" name="privatize_export" value="gedadmin"> ' . I18N::translate('Manager') . '<br>' .
-				'<input type="radio" name="privatize_export" value="user"> ' . I18N::translate('Member') . '<br>' .
-				'<input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') .
-				'</td></tr>';
-		} elseif (Auth::isMember($WT_TREE)) {
-			$out .=
-				'<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' .
-				'<td class="list_value">' .
-				'<input type="radio" name="privatize_export" value="user" checked> ' . I18N::translate('Member') . '<br>' .
-				'<input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') .
-				'</td></tr>';
-		}
-
-		$out .= '
+        if (Auth::isManager($WT_TREE)) {
+            $out .=
+                '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' .
+                '<td class="optionbox">' .
+                '<input type="radio" name="privatize_export" value="none" checked> ' . I18N::translate('None') . '<br>' .
+                '<input type="radio" name="privatize_export" value="gedadmin"> ' . I18N::translate('Manager') . '<br>' .
+                '<input type="radio" name="privatize_export" value="user"> ' . I18N::translate('Member') . '<br>' .
+                '<input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') .
+                '</td></tr>';
+        } elseif (Auth::isMember($WT_TREE)) {
+            $out .=
+                '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' .
+                '<td class="list_value">' .
+                '<input type="radio" name="privatize_export" value="user" checked> ' . I18N::translate('Member') . '<br>' .
+                '<input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') .
+                '</td></tr>';
+        }
+
+        $out .= '
 		<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Convert from UTF-8 to ISO-8859-1') . '</td>
 		<td class="optionbox"><input type="checkbox" name="convert" value="yes"></td></tr>
 
@@ -810,6 +810,6 @@ 
 		<input type="submit" value="' . /* I18N: A button label. */ I18N::translate('download') . '">
 		</form>';
 
-		return $out;
-	}
+        return $out;
+    }
 }

Switch Indentation +131 added lines, -131 removed lines

@@ -75,37 +75,37 @@ 
 		}
 
 		switch ($mod_action) {
-		case 'ajax':
-			$html = $this->getSidebarAjaxContent();
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $html;
-			break;
-		case 'index':
-			global $controller, $WT_TREE;
-
-			$MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
-
-			$clip_ctrl = new ClippingsCartController;
-			$cart      = Session::get('cart');
-
-			$controller = new PageController;
-			$controller
-				->setPageTitle($this->getTitle())
-				->pageHeader()
-				->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-				->addInlineJavascript('autocomplete();');
-
-			echo '<script>';
-			echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
-			echo '</script>';
-
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
-			}
-
-			if ($clip_ctrl->action == 'add') {
-				$record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
-				if ($clip_ctrl->type === 'FAM') { ?>
+		    case 'ajax':
+			    $html = $this->getSidebarAjaxContent();
+			    header('Content-Type: text/html; charset=UTF-8');
+			    echo $html;
+			    break;
+		    case 'index':
+			    global $controller, $WT_TREE;
+
+			    $MAX_PEDIGREE_GENERATIONS = $WT_TREE->getPreference('MAX_PEDIGREE_GENERATIONS');
+
+			    $clip_ctrl = new ClippingsCartController;
+			    $cart      = Session::get('cart');
+
+			    $controller = new PageController;
+			    $controller
+				    ->setPageTitle($this->getTitle())
+				    ->pageHeader()
+				    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+				    ->addInlineJavascript('autocomplete();');
+
+			    echo '<script>';
+			    echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}';
+			    echo '</script>';
+
+			    if (!$cart[$WT_TREE->getTreeId()]) {
+				    echo '<h2>', I18N::translate('Family tree clippings cart'), '</h2>';
+			    }
+
+			    if ($clip_ctrl->action == 'add') {
+				    $record = GedcomRecord::getInstance($clip_ctrl->id, $WT_TREE);
+				    if ($clip_ctrl->type === 'FAM') { ?>
 					<form action="module.php" method="get">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -131,14 +131,14 @@ 
 									<td class="optionbox">
 										<input type="radio" name="others" value="members" checked>
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their children', $record->getFullName()); ?>
+										    I18N::translate('%s and their children', $record->getFullName()); ?>
 									</td>
 								</tr>
 								<tr>
 									<td class="optionbox">
 										<input type="radio" name="others" value="descendants">
 										<?php echo /* I18N: %s is a family (husband + wife) */
-										I18N::translate('%s and their descendants', $record->getFullName()); ?>
+										    I18N::translate('%s and their descendants', $record->getFullName()); ?>
 									</td>
 								</tr>
 							</tbody>
@@ -179,14 +179,14 @@ 
 										<label>
 											<input type="radio" name="others" value="parents">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her parents and siblings', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his parents and siblings', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her parents and siblings', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his parents and siblings', $record->getFullName());
+											    }
+											    ?>
 										</label>
 									</td>
 								</tr>
@@ -195,14 +195,14 @@ 
 										<label>
 											<input type="radio" name="others" value="members">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and children', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and children', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her spouses and children', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his spouses and children', $record->getFullName());
+											    }
+											    ?>
 										</label>
 									</td>
 								</tr>
@@ -211,18 +211,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestors" id="ancestors">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s and her ancestors', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s and his ancestors', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s and her ancestors', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s and his ancestors', $record->getFullName());
+											    }
+											    ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
+    										<input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');">
 									</td>
 								</tr>
 								<tr>
@@ -230,18 +230,18 @@ 
 										<label>
 											<input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her ancestors and their families', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his ancestors and their families', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her ancestors and their families', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his ancestors and their families', $record->getFullName());
+											    }
+											    ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
+    										<input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');">
 									</td>
 								</tr>
 								<tr>
@@ -249,18 +249,18 @@ 
 										<label>
 											<input type="radio" name="others" value="descendants" id="descendants">
 											<?php
-											if ($record->getSex() === 'F') {
-												echo /* I18N: %s is a woman's name */
-												I18N::translate('%s, her spouses and descendants', $record->getFullName());
-											} else {
-												echo /* I18N: %s is a man's name */
-												I18N::translate('%s, his spouses and descendants', $record->getFullName());
-											}
-											?>
+											    if ($record->getSex() === 'F') {
+												    echo /* I18N: %s is a woman's name */
+												    I18N::translate('%s, her spouses and descendants', $record->getFullName());
+											    } else {
+												    echo /* I18N: %s is a man's name */
+												    I18N::translate('%s, his spouses and descendants', $record->getFullName());
+											    }
+											    ?>
 										</label>
 										<br>
 										<?php echo I18N::translate('Number of generations'); ?>
-										<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
+    										<input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');">
 									</td>
 								</tr>
 							</tbody>
@@ -302,7 +302,7 @@ 
 										<label>
 											<input type="radio" name="others" value="linked">
 											<?php echo /* I18N: %s is the name of a source */
-											I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
+											    I18N::translate('%s and the individuals that reference it.', $record->getFullName()); ?>
 										</label>
 									</td>
 								</tr>
@@ -317,12 +317,12 @@ 
 						</table>
 					</form>
 				<?php }
-			}
+			    }
 
-			if (!$cart[$WT_TREE->getTreeId()]) {
-				if ($clip_ctrl->action != 'add') {
-					echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
-					?>
+			    if (!$cart[$WT_TREE->getTreeId()]) {
+				    if ($clip_ctrl->action != 'add') {
+					    echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.');
+					    ?>
 					<form method="get" name="addin" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -342,25 +342,25 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+    										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+    										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id', ''); ?>
+    										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
 						</table>
 					</form>
 					<?php
-				}
+				    }
 
-				// -- end new lines
-				echo I18N::translate('Your clippings cart is empty.');
-			} else {
-				// Keep track of the INDI from the parent page, otherwise it will
-				// get lost after ajax updates
-				$pid = Filter::get('pid', WT_REGEX_XREF);
+				    // -- end new lines
+				    echo I18N::translate('Your clippings cart is empty.');
+			    } else {
+				    // Keep track of the INDI from the parent page, otherwise it will
+				    // get lost after ajax updates
+				    $pid = Filter::get('pid', WT_REGEX_XREF);
 
-				if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
+				    if ($clip_ctrl->action !== 'download' && $clip_ctrl->action !== 'add') { ?>
 					<form method="get" action="module.php">
 						<input type="hidden" name="mod" value="clippings">
 						<input type="hidden" name="mod_action" value="index">
@@ -468,9 +468,9 @@ 
 									</td>
 									<td class="optionbox">
 										<?php echo FunctionsPrint::printFindIndividualLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
-										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
-										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
+    										<?php echo FunctionsPrint::printFindFamilyLink('cart_item_id'); ?>
+    										<?php echo FunctionsPrint::printFindSourceLink('cart_item_id'); ?>
+    										<input type="submit" value="<?php echo /* I18N: A button label. */ I18N::translate('add'); ?>">
 									</td>
 								</tr>
 							</tbody>
@@ -500,32 +500,32 @@ 
 					</thead>
 					<tbody>
 						<?php
-						foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
-							$record = GedcomRecord::getInstance($xref, $WT_TREE);
-							if ($record) {
-								switch ($record::RECORD_TYPE) {
-								case 'INDI':
-									$icon = 'icon-indis';
-									break;
-								case 'FAM':
-									$icon = 'icon-sfamily';
-									break;
-								case 'SOUR':
-									$icon = 'icon-source';
-									break;
-								case 'REPO':
-									$icon = 'icon-repository';
-									break;
-								case 'NOTE':
-									$icon = 'icon-note';
-									break;
-								case 'OBJE':
-									$icon = 'icon-media';
-									break;
-								default:
-									$icon = 'icon-clippings';
-									break;
-								}
+						    foreach (array_keys($cart[$WT_TREE->getTreeId()]) as $xref) {
+							    $record = GedcomRecord::getInstance($xref, $WT_TREE);
+							    if ($record) {
+								    switch ($record::RECORD_TYPE) {
+								        case 'INDI':
+									        $icon = 'icon-indis';
+									        break;
+								        case 'FAM':
+									        $icon = 'icon-sfamily';
+									        break;
+								        case 'SOUR':
+									        $icon = 'icon-source';
+									        break;
+								        case 'REPO':
+									        $icon = 'icon-repository';
+									        break;
+								        case 'NOTE':
+									        $icon = 'icon-note';
+									        break;
+								        case 'OBJE':
+									        $icon = 'icon-media';
+									        break;
+								        default:
+									        $icon = 'icon-clippings';
+									        break;
+								    }
 								?>
 								<tr>
 									<td class="list_value">
@@ -544,9 +544,9 @@ 
 				<?php
 			}
 			break;
-		default:
-			http_response_code(404);
-			break;
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 
@@ -695,12 +695,12 @@ 
 				$record = GedcomRecord::getInstance($xref, $WT_TREE);
 				if ($record instanceof Individual || $record instanceof Family) {
 					switch ($record::RECORD_TYPE) {
-					case 'INDI':
-						$icon = 'icon-indis';
-						break;
-					case 'FAM':
-						$icon = 'icon-sfamily';
-						break;
+					    case 'INDI':
+						    $icon = 'icon-indis';
+						    break;
+					    case 'FAM':
+						    $icon = 'icon-sfamily';
+						    break;
 					}
 					$out .= '<li>';
 					if (!empty($icon)) {

Braces +24 added lines, -12 removed lines

@@ -33,13 +33,15 @@ 
  */
 class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, ModuleSidebarInterface {
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */
 			I18N::translate('Clippings cart');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Clippings cart” module */
 			I18N::translate('Select records from your family tree and save them as a GEDCOM file.');
 	}
@@ -51,7 +53,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_USER;
 	}
 
@@ -61,7 +64,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		global $WT_TREE;
 
 		// Only allow access if either the menu or sidebar is enabled.
@@ -555,7 +559,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultMenuOrder() {
+	public function defaultMenuOrder()
+	{
 		return 20;
 	}
 
@@ -564,7 +569,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getMenu() {
+	public function getMenu()
+	{
 		global $controller, $WT_TREE;
 
 		$submenus = array();
@@ -583,12 +589,14 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
+	public function defaultSidebarOrder()
+	{
 		return 60;
 	}
 
 	/** {@inheritdoc} */
-	public function hasSidebarContent() {
+	public function hasSidebarContent()
+	{
 		// Creating a controller has the side effect of initialising the cart
 		new ClippingsCartController;
 
@@ -600,7 +608,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSidebarContent() {
+	public function getSidebarContent()
+	{
 		global $controller;
 
 		$controller->addInlineJavascript('
@@ -614,7 +623,8 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
+	public function getSidebarAjaxContent()
+	{
 		global $WT_TREE;
 
 		$cart = Session::get('cart');
@@ -678,7 +688,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCartList() {
+	public function getCartList()
+	{
 		global $WT_TREE;
 
 		$cart = Session::get('cart', array());
@@ -747,7 +758,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function downloadForm(ClippingsCartController $clip_ctrl) {
+	public function downloadForm(ClippingsCartController $clip_ctrl)
+	{
 		global $WT_TREE;
 
 		$pid = Filter::get('pid', WT_REGEX_XREF);