fisharebest / webtrees

app/Module/UserWelcomeModule.php

Indentation +57 added lines, -57 removed lines

@@ -24,71 +24,71 @@
  * Class UserWelcomeModule
  */
 class UserWelcomeModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('My page');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('My page');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “My page” module */ I18N::translate('A greeting message and useful links for a user.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “My page” module */ I18N::translate('A greeting message and useful links for a user.');
+    }
 
-	/**
-	 * 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;
+    /**
+     * 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;
 
-		$id      = $this->getName() . $block_id;
-		$class   = $this->getName() . '_block';
-		$title   = '<span dir="auto">' . /* I18N: A greeting; %s is the user’s name */ I18N::translate('Welcome %s', Auth::user()->getRealNameHtml()) . '</span>';
-		$content = '<table><tr>';
-		$content .= '<td><a href="edituser.php"><i class="icon-mypage"></i><br>' . I18N::translate('My account') . '</a></td>';
+        $id      = $this->getName() . $block_id;
+        $class   = $this->getName() . '_block';
+        $title   = '<span dir="auto">' . /* I18N: A greeting; %s is the user’s name */ I18N::translate('Welcome %s', Auth::user()->getRealNameHtml()) . '</span>';
+        $content = '<table><tr>';
+        $content .= '<td><a href="edituser.php"><i class="icon-mypage"></i><br>' . I18N::translate('My account') . '</a></td>';
 
-		$gedcomid = $WT_TREE->getUserPreference(Auth::user(), 'gedcomid');
+        $gedcomid = $WT_TREE->getUserPreference(Auth::user(), 'gedcomid');
 
-		if ($gedcomid) {
-			if (Module::isActiveChart($WT_TREE, 'pedigree_chart')) {
-				$content .= '<td><a href="pedigree.php?rootid=' . $gedcomid . '&amp;ged=' . $WT_TREE->getNameUrl() . '"><i class="icon-pedigree"></i><br>' . I18N::translate('My pedigree') . '</a></td>';
-			}
-			$content .= '<td><a href="individual.php?pid=' . $gedcomid . '&amp;ged=' . $WT_TREE->getNameUrl() . '"><i class="icon-indis"></i><br>' . I18N::translate('My individual record') . '</a></td>';
-		}
-		$content .= '</tr></table>';
+        if ($gedcomid) {
+            if (Module::isActiveChart($WT_TREE, 'pedigree_chart')) {
+                $content .= '<td><a href="pedigree.php?rootid=' . $gedcomid . '&amp;ged=' . $WT_TREE->getNameUrl() . '"><i class="icon-pedigree"></i><br>' . I18N::translate('My pedigree') . '</a></td>';
+            }
+            $content .= '<td><a href="individual.php?pid=' . $gedcomid . '&amp;ged=' . $WT_TREE->getNameUrl() . '"><i class="icon-indis"></i><br>' . I18N::translate('My individual record') . '</a></td>';
+        }
+        $content .= '</tr></table>';
 
-		if ($template) {
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
+        if ($template) {
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return false;
-	}
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return false;
+    }
 
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
 
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return false;
-	}
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return false;
+    }
 
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-	}
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -23,14 +23,17 @@ 
 /**
  * Class UserWelcomeModule
  */
-class UserWelcomeModule extends AbstractModule implements ModuleBlockInterface {
+class UserWelcomeModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('My page');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “My page” module */ I18N::translate('A greeting message and useful links for a user.');
 	}
 
@@ -43,7 +46,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $WT_TREE;
 
 		$id      = $this->getName() . $block_id;
@@ -70,17 +74,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 false;
 	}
 
@@ -89,6 +96,7 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 	}
 }

app/Module/UserMessagesModule.php

Indentation +158 added lines, -158 removed lines

@@ -28,162 +28,162 @@
  * Class UserMessagesModule
  */
 class UserMessagesModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Messages');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Messages” module */ I18N::translate('Communicate directly with other users, using private messages.');
-	}
-
-	/**
-	 * 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) {
-		switch ($mod_action) {
-		case 'delete':
-			$stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
-
-			foreach (Filter::postArray('message_id') as $id) {
-				$stmt->execute(array(
-					'message_id' => $id,
-					'user_id'    => Auth::id(),
-				));
-			}
-		}
-
-		$ged   = Filter::post('ged');
-		$ctype = Filter::post('ctype', 'user|gedcom', 'user');
-
-		header('Location: ' . WT_BASE_URL . 'index.php?ged=' . Filter::escapeUrl($ged) . '&ctype=' . $ctype);
-	}
-
-	/**
-	 * 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, $WT_TREE;
-
-		$block = $this->getBlockSetting($block_id, 'block', '1');
-		foreach (array('block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-		$messages = Database::prepare("SELECT message_id, sender, subject, body, UNIX_TIMESTAMP(created) AS created FROM `##message` WHERE user_id=? ORDER BY message_id DESC")
-			->execute(array(Auth::id()))
-			->fetchAll();
-
-		$count = count($messages);
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		$title = I18N::plural('%s message', '%s messages', $count, I18N::number($count));
-		$users = array_filter(User::all(), function (User $user) {
-			return $user->getUserId() !== Auth::id() && $user->getPreference('verified_by_admin') && $user->getPreference('contactmethod') !== 'none';
-		});
-
-		$content = '<form id="messageform" name="messageform" method="post" action="module.php?mod=user_messages&mod_action=delete" onsubmit="return confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\');">';
-		$content .= '<input type="hidden" name="ged" value="' . $ctype . '">';
-		$content .= '<input type="hidden" name="ctype" value="' . $WT_TREE->getNameHtml() . '">';
-		if ($users) {
-			$content .= '<label for="touser">' . I18N::translate('Send a message') . '</label>';
-			$content .= '<select id="touser" name="touser">';
-			$content .= '<option value="">' . I18N::translate('&lt;select&gt;') . '</option>';
-			foreach ($users as $user) {
-				$content .= sprintf('<option value="%1$s">%2$s - %1$s</option>', Filter::escapeHtml($user->getUserName()), Filter::escapeHtml($user->getRealName()));
-			}
-			$content .= '</select>';
-			$content .= '<input type="button" value="' . I18N::translate('Send') . '" onclick="return message(document.messageform.touser.options[document.messageform.touser.selectedIndex].value, \'messaging2\', \'\');"><br><br>';
-		}
-		if ($messages) {
-			$content .= '<table class="list_table"><tr>';
-			$content .= '<th class="list_label">' . I18N::translate('Delete') . '<br><a href="#" onclick="jQuery(\'#' . $this->getName() . $block_id . ' :checkbox\').prop(\'checked\', true); return false;">' . I18N::translate('All') . '</a></th>';
-			$content .= '<th class="list_label">' . I18N::translate('Subject') . '</th>';
-			$content .= '<th class="list_label">' . I18N::translate('Date sent') . '</th>';
-			$content .= '<th class="list_label">' . I18N::translate('Email address') . '</th>';
-			$content .= '</tr>';
-			foreach ($messages as $message) {
-				$content .= '<tr>';
-				$content .= '<td class="list_value_wrap"><input type="checkbox" name="message_id[]" value="' . $message->message_id . '" id="cb_message' . $message->message_id . '"></td>';
-				$content .= '<td class="list_value_wrap"><a href="#" onclick="return expand_layer(\'message' . $message->message_id . '\');"><i id="message' . $message->message_id . '_img" class="icon-plus"></i> <b dir="auto">' . Filter::escapeHtml($message->subject) . '</b></a></td>';
-				$content .= '<td class="list_value_wrap">' . FunctionsDate::formatTimestamp($message->created + WT_TIMESTAMP_OFFSET) . '</td>';
-				$content .= '<td class="list_value_wrap">';
-				$user = User::findByIdentifier($message->sender);
-				if ($user) {
-					$content .= $user->getRealNameHtml();
-					$content .= '  - <span dir="auto">' . $user->getEmail() . '</span>';
-				} else {
-					$content .= '<a href="mailto:' . Filter::escapeHtml($message->sender) . '">' . Filter::escapeHtml($message->sender) . '</a>';
-				}
-				$content .= '</td>';
-				$content .= '</tr>';
-				$content .= '<tr><td class="list_value_wrap" colspan="4"><div id="message' . $message->message_id . '" style="display:none;">';
-				$content .= '<div dir="auto" style="white-space: pre-wrap;">' . Filter::expandUrls($message->body) . '</div><br>';
-				if (strpos($message->subject, /* I18N: When replying to an email, the subject becomes “RE: <subject>” */ I18N::translate('RE: ')) !== 0) {
-					$message->subject = I18N::translate('RE: ') . $message->subject;
-				}
-				if ($user) {
-					$content .= '<button type="button" onclick="reply(\'' . Filter::escapeJs($message->sender) . '\', \'' . Filter::escapeJs($message->subject) . '\'); return false;">' . I18N::translate('Reply') . '</button> ';
-				}
-				$content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {jQuery(\'#messageform :checkbox\').prop(\'checked\', false); jQuery(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
-			}
-			$content .= '</table>';
-			$content .= '<p><button type="submit">' . I18N::translate('Delete selected messages') . '</button></p>';
-		}
-		$content .= '</form>';
-
-		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 false;
-	}
-
-	/**
-	 * 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', '1');
-		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>';
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Messages');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Messages” module */ I18N::translate('Communicate directly with other users, using private messages.');
+    }
+
+    /**
+     * 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) {
+        switch ($mod_action) {
+        case 'delete':
+            $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
+
+            foreach (Filter::postArray('message_id') as $id) {
+                $stmt->execute(array(
+                    'message_id' => $id,
+                    'user_id'    => Auth::id(),
+                ));
+            }
+        }
+
+        $ged   = Filter::post('ged');
+        $ctype = Filter::post('ctype', 'user|gedcom', 'user');
+
+        header('Location: ' . WT_BASE_URL . 'index.php?ged=' . Filter::escapeUrl($ged) . '&ctype=' . $ctype);
+    }
+
+    /**
+     * 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, $WT_TREE;
+
+        $block = $this->getBlockSetting($block_id, 'block', '1');
+        foreach (array('block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+        $messages = Database::prepare("SELECT message_id, sender, subject, body, UNIX_TIMESTAMP(created) AS created FROM `##message` WHERE user_id=? ORDER BY message_id DESC")
+            ->execute(array(Auth::id()))
+            ->fetchAll();
+
+        $count = count($messages);
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        $title = I18N::plural('%s message', '%s messages', $count, I18N::number($count));
+        $users = array_filter(User::all(), function (User $user) {
+            return $user->getUserId() !== Auth::id() && $user->getPreference('verified_by_admin') && $user->getPreference('contactmethod') !== 'none';
+        });
+
+        $content = '<form id="messageform" name="messageform" method="post" action="module.php?mod=user_messages&mod_action=delete" onsubmit="return confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\');">';
+        $content .= '<input type="hidden" name="ged" value="' . $ctype . '">';
+        $content .= '<input type="hidden" name="ctype" value="' . $WT_TREE->getNameHtml() . '">';
+        if ($users) {
+            $content .= '<label for="touser">' . I18N::translate('Send a message') . '</label>';
+            $content .= '<select id="touser" name="touser">';
+            $content .= '<option value="">' . I18N::translate('&lt;select&gt;') . '</option>';
+            foreach ($users as $user) {
+                $content .= sprintf('<option value="%1$s">%2$s - %1$s</option>', Filter::escapeHtml($user->getUserName()), Filter::escapeHtml($user->getRealName()));
+            }
+            $content .= '</select>';
+            $content .= '<input type="button" value="' . I18N::translate('Send') . '" onclick="return message(document.messageform.touser.options[document.messageform.touser.selectedIndex].value, \'messaging2\', \'\');"><br><br>';
+        }
+        if ($messages) {
+            $content .= '<table class="list_table"><tr>';
+            $content .= '<th class="list_label">' . I18N::translate('Delete') . '<br><a href="#" onclick="jQuery(\'#' . $this->getName() . $block_id . ' :checkbox\').prop(\'checked\', true); return false;">' . I18N::translate('All') . '</a></th>';
+            $content .= '<th class="list_label">' . I18N::translate('Subject') . '</th>';
+            $content .= '<th class="list_label">' . I18N::translate('Date sent') . '</th>';
+            $content .= '<th class="list_label">' . I18N::translate('Email address') . '</th>';
+            $content .= '</tr>';
+            foreach ($messages as $message) {
+                $content .= '<tr>';
+                $content .= '<td class="list_value_wrap"><input type="checkbox" name="message_id[]" value="' . $message->message_id . '" id="cb_message' . $message->message_id . '"></td>';
+                $content .= '<td class="list_value_wrap"><a href="#" onclick="return expand_layer(\'message' . $message->message_id . '\');"><i id="message' . $message->message_id . '_img" class="icon-plus"></i> <b dir="auto">' . Filter::escapeHtml($message->subject) . '</b></a></td>';
+                $content .= '<td class="list_value_wrap">' . FunctionsDate::formatTimestamp($message->created + WT_TIMESTAMP_OFFSET) . '</td>';
+                $content .= '<td class="list_value_wrap">';
+                $user = User::findByIdentifier($message->sender);
+                if ($user) {
+                    $content .= $user->getRealNameHtml();
+                    $content .= '  - <span dir="auto">' . $user->getEmail() . '</span>';
+                } else {
+                    $content .= '<a href="mailto:' . Filter::escapeHtml($message->sender) . '">' . Filter::escapeHtml($message->sender) . '</a>';
+                }
+                $content .= '</td>';
+                $content .= '</tr>';
+                $content .= '<tr><td class="list_value_wrap" colspan="4"><div id="message' . $message->message_id . '" style="display:none;">';
+                $content .= '<div dir="auto" style="white-space: pre-wrap;">' . Filter::expandUrls($message->body) . '</div><br>';
+                if (strpos($message->subject, /* I18N: When replying to an email, the subject becomes “RE: <subject>” */ I18N::translate('RE: ')) !== 0) {
+                    $message->subject = I18N::translate('RE: ') . $message->subject;
+                }
+                if ($user) {
+                    $content .= '<button type="button" onclick="reply(\'' . Filter::escapeJs($message->sender) . '\', \'' . Filter::escapeJs($message->subject) . '\'); return false;">' . I18N::translate('Reply') . '</button> ';
+                }
+                $content .= '<button type="button" onclick="if (confirm(\'' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '\')) {jQuery(\'#messageform :checkbox\').prop(\'checked\', false); jQuery(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
+            }
+            $content .= '</table>';
+            $content .= '<p><button type="submit">' . I18N::translate('Delete selected messages') . '</button></p>';
+        }
+        $content .= '</form>';
+
+        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 false;
+    }
+
+    /**
+     * 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', '1');
+        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>';
+    }
 }

Switch Indentation +9 added lines, -9 removed lines

@@ -46,15 +46,15 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'delete':
-			$stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
-
-			foreach (Filter::postArray('message_id') as $id) {
-				$stmt->execute(array(
-					'message_id' => $id,
-					'user_id'    => Auth::id(),
-				));
-			}
+		    case 'delete':
+			    $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
+
+			    foreach (Filter::postArray('message_id') as $id) {
+				    $stmt->execute(array(
+					    'message_id' => $id,
+					    'user_id'    => Auth::id(),
+				    ));
+			    }
 		}
 
 		$ged   = Filter::post('ged');

Braces +18 added lines, -9 removed lines

@@ -27,14 +27,17 @@ 
 /**
  * Class UserMessagesModule
  */
-class UserMessagesModule extends AbstractModule implements ModuleBlockInterface {
+class UserMessagesModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Messages');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Messages” module */ I18N::translate('Communicate directly with other users, using private messages.');
 	}
 
@@ -44,7 +47,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'delete':
 			$stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
@@ -72,7 +76,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $ctype, $WT_TREE;
 
 		$block = $this->getBlockSetting($block_id, 'block', '1');
@@ -155,17 +160,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 false;
 	}
 
@@ -174,7 +182,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'));
 		}

app/Module/RelatedIndividualsReportModule.php

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
  * Class RelatedIndividualsReportModule
  */
 class RelatedIndividualsReportModule extends AbstractModule implements ModuleReportInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Name of a report */ I18N::translate('Related individuals');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a report */ I18N::translate('Related individuals');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Related individuals” module */ I18N::translate('A report of the individuals that are closely related to an individual.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Description of the “Related individuals” module */ I18N::translate('A report of the individuals that are closely related to an individual.');
+    }
 
-	/**
-	 * 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 report.
-	 *
-	 * @return Menu
-	 */
-	public function getReportMenu() {
-		global $controller, $WT_TREE;
+    /**
+     * Return a menu item for this report.
+     *
+     * @return Menu
+     */
+    public function getReportMenu() {
+        global $controller, $WT_TREE;
 
-		return new Menu(
-			$this->getTitle(),
-			'reportengine.php?ged=' . $WT_TREE->getNameUrl() . '&action=setup&report=' . WT_MODULES_DIR . $this->getName() . '/report.xml&pid=' . $controller->getSignificantIndividual()->getXref(),
-			'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&pid=' . $controller->getSignificantIndividual()->getXref(),
+            'menu-report-' . $this->getName(),
+            array('rel' => 'nofollow')
+        );
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class RelatedIndividualsReportModule
  */
-class RelatedIndividualsReportModule extends AbstractModule implements ModuleReportInterface {
+class RelatedIndividualsReportModule 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 report */ I18N::translate('Related individuals');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Related individuals” module */ I18N::translate('A report of the individuals that are closely related to an individual.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $controller, $WT_TREE;
 
 		return new Menu(

app/Module/CensusAssistantModule.php

Indentation +370 added lines, -370 removed lines

@@ -34,110 +34,110 @@ 
  * Class CensusAssistantModule
  */
 class CensusAssistantModule extends AbstractModule {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Census assistant');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Census assistant” module */ I18N::translate('An alternative way to enter census transcripts and link them to individuals.');
-	}
-
-	/**
-	 * This is a general purpose hook, allowing modules to respond to routes
-	 * of the form module.php?mod=FOO&mod_action=BAR
-	 *
-	 * @param string $mod_action
-	 */
-	public function modAction($mod_action) {
-		switch ($mod_action) {
-		case 'census_find':
-			self::censusFind();
-			break;
-		case 'media_find':
-			self::mediaFind();
-			break;
-		case 'media_query_3a':
-			self::mediaQuery();
-			break;
-		default:
-			http_response_code(404);
-		}
-	}
-
-	/**
-	 * Find an individual.
-	 */
-	private static function censusFind() {
-		global $WT_TREE;
-
-		$controller = new SimpleController;
-		$filter     = Filter::get('filter');
-		$action     = Filter::get('action');
-		$census     = Filter::get('census');
-		$census     = new $census;
-
-		$controller
-			->restrictAccess($census instanceof CensusInterface)
-			->setPageTitle(I18N::translate('Find an individual'))
-			->pageHeader();
-
-		echo '<table class="list_table width90" border="0">';
-		echo '<tr><td style="padding: 10px;" class="facts_label03 width90">';
-		echo I18N::translate('Find an individual');
-		echo '</td>';
-		echo '</table>';
-		echo '<br>';
-
-		if ($action == 'filter') {
-			$filter       = trim($filter);
-			$filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
-
-			// Output Individual for GEDFact Assistant ======================
-			echo '<table class="list_table width90">';
-			$myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
-			if ($myindilist) {
-				echo '<tr><td class="list_value_wrap"><ul>';
-				usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-				foreach ($myindilist as $indi) {
-					echo '<li>';
-					echo '<a href="#" onclick="window.opener.appendCensusRow(\'' . Filter::escapeJs(self::censusTableRow($census, $indi, null)) . '\'); window.close();">';
-					echo '<b>' . $indi->getFullName() . '</b>';
-					echo '</a>';
-					echo $indi->formatFirstMajorFact(WT_EVENTS_BIRT, 1);
-					echo $indi->formatFirstMajorFact(WT_EVENTS_DEAT, 1);
-					echo '<hr>';
-					echo '</li>';
-				}
-				echo '</ul></td></tr>';
-			} else {
-				echo '<tr><td class="list_value_wrap">';
-				echo I18N::translate('No results found.');
-				echo '</td></tr>';
-			}
-			echo '<tr><td>';
-			echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
-			echo '</td></tr>';
-			echo '</table>';
-		}
-	}
-
-	/**
-	 * Find a media object.
-	 */
-	private static function mediaFind() {
-		global $WT_TREE;
-
-		$controller = new SimpleController;
-		$filter     = Filter::get('filter');
-		$multiple   = Filter::getBool('multiple');
-
-		$controller
-			->setPageTitle(I18N::translate('Find an individual'))
-			->pageHeader();
-
-		?>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Census assistant');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Census assistant” module */ I18N::translate('An alternative way to enter census transcripts and link them to individuals.');
+    }
+
+    /**
+     * This is a general purpose hook, allowing modules to respond to routes
+     * of the form module.php?mod=FOO&mod_action=BAR
+     *
+     * @param string $mod_action
+     */
+    public function modAction($mod_action) {
+        switch ($mod_action) {
+        case 'census_find':
+            self::censusFind();
+            break;
+        case 'media_find':
+            self::mediaFind();
+            break;
+        case 'media_query_3a':
+            self::mediaQuery();
+            break;
+        default:
+            http_response_code(404);
+        }
+    }
+
+    /**
+     * Find an individual.
+     */
+    private static function censusFind() {
+        global $WT_TREE;
+
+        $controller = new SimpleController;
+        $filter     = Filter::get('filter');
+        $action     = Filter::get('action');
+        $census     = Filter::get('census');
+        $census     = new $census;
+
+        $controller
+            ->restrictAccess($census instanceof CensusInterface)
+            ->setPageTitle(I18N::translate('Find an individual'))
+            ->pageHeader();
+
+        echo '<table class="list_table width90" border="0">';
+        echo '<tr><td style="padding: 10px;" class="facts_label03 width90">';
+        echo I18N::translate('Find an individual');
+        echo '</td>';
+        echo '</table>';
+        echo '<br>';
+
+        if ($action == 'filter') {
+            $filter       = trim($filter);
+            $filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
+
+            // Output Individual for GEDFact Assistant ======================
+            echo '<table class="list_table width90">';
+            $myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
+            if ($myindilist) {
+                echo '<tr><td class="list_value_wrap"><ul>';
+                usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+                foreach ($myindilist as $indi) {
+                    echo '<li>';
+                    echo '<a href="#" onclick="window.opener.appendCensusRow(\'' . Filter::escapeJs(self::censusTableRow($census, $indi, null)) . '\'); window.close();">';
+                    echo '<b>' . $indi->getFullName() . '</b>';
+                    echo '</a>';
+                    echo $indi->formatFirstMajorFact(WT_EVENTS_BIRT, 1);
+                    echo $indi->formatFirstMajorFact(WT_EVENTS_DEAT, 1);
+                    echo '<hr>';
+                    echo '</li>';
+                }
+                echo '</ul></td></tr>';
+            } else {
+                echo '<tr><td class="list_value_wrap">';
+                echo I18N::translate('No results found.');
+                echo '</td></tr>';
+            }
+            echo '<tr><td>';
+            echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
+            echo '</td></tr>';
+            echo '</table>';
+        }
+    }
+
+    /**
+     * Find a media object.
+     */
+    private static function mediaFind() {
+        global $WT_TREE;
+
+        $controller = new SimpleController;
+        $filter     = Filter::get('filter');
+        $multiple   = Filter::getBool('multiple');
+
+        $controller
+            ->setPageTitle(I18N::translate('Find an individual'))
+            ->pageHeader();
+
+        ?>
 		<script>
 		function pasterow(id, name, gend, yob, age, bpl) {
 			window.opener.opener.insertRowToTable(id, name, '', gend, '', yob, age, 'Y', '', bpl);
@@ -178,27 +178,27 @@ 
 		</script>
 
 		<?php
-		echo '<div>';
-		echo '<table class="list_table width90" border="0">';
-		echo '<tr><td style="padding: 10px;" class="facts_label03 width90">'; // start column for find text header
-		echo $controller->getPageTitle();
-		echo '</td>';
-		echo '</tr>';
-		echo '</table>';
-		echo '<br>';
-		echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
-		echo '<br>';
-
-		$filter       = trim($filter);
-		$filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
-		echo '<table class="tabs_table width90"><tr>';
-		$myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
-		if ($myindilist) {
-			echo '<td class="list_value_wrap"><ul>';
-			usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
-			foreach ($myindilist as $indi) {
-				$nam = Filter::escapeHtml($indi->getFullName());
-				echo "<li><a href=\"#\" onclick=\"pasterow(
+        echo '<div>';
+        echo '<table class="list_table width90" border="0">';
+        echo '<tr><td style="padding: 10px;" class="facts_label03 width90">'; // start column for find text header
+        echo $controller->getPageTitle();
+        echo '</td>';
+        echo '</tr>';
+        echo '</table>';
+        echo '<br>';
+        echo '<button onclick="window.close();">', I18N::translate('close'), '</button>';
+        echo '<br>';
+
+        $filter       = trim($filter);
+        $filter_array = explode(' ', preg_replace('/ {2,}/', ' ', $filter));
+        echo '<table class="tabs_table width90"><tr>';
+        $myindilist = FunctionsDb::searchIndividualNames($filter_array, array($WT_TREE));
+        if ($myindilist) {
+            echo '<td class="list_value_wrap"><ul>';
+            usort($myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
+            foreach ($myindilist as $indi) {
+                $nam = Filter::escapeHtml($indi->getFullName());
+                echo "<li><a href=\"#\" onclick=\"pasterow(
 					'" . $indi->getXref() . "' ,
 					'" . $nam . "' ,
 					'" . $indi->getSex() . "' ,
@@ -207,44 +207,44 @@ 
 					'" . $indi->getBirthPlace() . "'); return false;\">
 					<b>" . $indi->getFullName() . "</b>&nbsp;&nbsp;&nbsp;";
 
-				$born = GedcomTag::getLabel('BIRT');
-				echo "</span><br><span class=\"list_item\">", $born, " ", $indi->getBirthYear(), "&nbsp;&nbsp;&nbsp;", $indi->getBirthPlace(), "</span></a></li>";
-				echo "<hr>";
-			}
-			echo '</ul></td></tr><tr><td class="list_label">', I18N::translate('Total individuals: %s', count($myindilist)), '</tr></td>';
-		} else {
-			echo "<td class=\"list_value_wrap\">";
-			echo I18N::translate('No results found.');
-			echo "</td></tr>";
-		}
-		echo "</table>";
-		echo '</div>';
-	}
-
-	/**
-	 * Search for a media object.
-	 */
-	private static function mediaQuery() {
-		global $WT_TREE;
-
-		$iid2 = Filter::get('iid', WT_REGEX_XREF);
-
-		$controller = new SimpleController;
-		$controller
-			->setPageTitle(I18N::translate('Link to an existing media object'))
-			->pageHeader();
-
-		$record = GedcomRecord::getInstance($iid2, $WT_TREE);
-		if ($record) {
-			$headjs = '';
-			if ($record instanceof Family) {
-				if ($record->getHusband()) {
-					$headjs = $record->getHusband()->getXref();
-				} elseif ($record->getWife()) {
-					$headjs = $record->getWife()->getXref();
-				}
-			}
-			?>
+                $born = GedcomTag::getLabel('BIRT');
+                echo "</span><br><span class=\"list_item\">", $born, " ", $indi->getBirthYear(), "&nbsp;&nbsp;&nbsp;", $indi->getBirthPlace(), "</span></a></li>";
+                echo "<hr>";
+            }
+            echo '</ul></td></tr><tr><td class="list_label">', I18N::translate('Total individuals: %s', count($myindilist)), '</tr></td>';
+        } else {
+            echo "<td class=\"list_value_wrap\">";
+            echo I18N::translate('No results found.');
+            echo "</td></tr>";
+        }
+        echo "</table>";
+        echo '</div>';
+    }
+
+    /**
+     * Search for a media object.
+     */
+    private static function mediaQuery() {
+        global $WT_TREE;
+
+        $iid2 = Filter::get('iid', WT_REGEX_XREF);
+
+        $controller = new SimpleController;
+        $controller
+            ->setPageTitle(I18N::translate('Link to an existing media object'))
+            ->pageHeader();
+
+        $record = GedcomRecord::getInstance($iid2, $WT_TREE);
+        if ($record) {
+            $headjs = '';
+            if ($record instanceof Family) {
+                if ($record->getHusband()) {
+                    $headjs = $record->getHusband()->getXref();
+                } elseif ($record->getWife()) {
+                    $headjs = $record->getWife()->getXref();
+                }
+            }
+            ?>
 			<script>
 				function insertId() {
 					if (window.opener.document.getElementById('addlinkQueue')) {
@@ -255,8 +255,8 @@ 
 				}
 			</script>
 			<?php
-		} else {
-			?>
+        } else {
+            ?>
 			<script>
 				function insertId() {
 					window.opener.alert('<?php echo $iid2; ?> - <?php echo I18N::translate('Not a valid individual, family, or source ID'); ?>');
@@ -264,178 +264,178 @@ 
 				}
 			</script>
 			<?php
-		}
-		?>
+        }
+        ?>
 		<script>window.onLoad = insertId();</script>
 		<?php
-	}
-
-	/**
-	 * Convert custom markup into HTML
-	 *
-	 * @param Note $note
-	 *
-	 * @return string
-	 */
-	public static function formatCensusNote(Note $note) {
-		global $WT_TREE;
-
-		if (preg_match('/(.*)((?:\n.*)*)\n\.start_formatted_area\.\n(.+)\n(.+(?:\n.+)*)\n.end_formatted_area\.((?:\n.*)*)/', $note->getNote(), $match)) {
-			// This looks like a census-assistant shared note
-			$title     = Filter::escapeHtml($match[1]);
-			$preamble  = Filter::escapeHtml($match[2]);
-			$header    = Filter::escapeHtml($match[3]);
-			$data      = Filter::escapeHtml($match[4]);
-			$postamble = Filter::escapeHtml($match[5]);
-
-			// Get the column headers for the census to which this note refers
-			// requires the fact place & date to match the specific census
-			// censusPlace() (Soundex match) and censusDate() functions
-			$fmt_headers   = array();
-			$linkedRecords = array_merge($note->linkedIndividuals('NOTE'), $note->linkedFamilies('NOTE'));
-			$firstRecord   = array_shift($linkedRecords);
-			if ($firstRecord) {
-				$countryCode = '';
-				$date        = '';
-				foreach ($firstRecord->getFacts('CENS') as $fact) {
-					if (trim($fact->getAttribute('NOTE'), '@') === $note->getXref()) {
-						$date        = $fact->getAttribute('DATE');
-						$place       = explode(',', strip_tags($fact->getPlace()->getFullName()));
-						$countryCode = Soundex::daitchMokotoff(array_pop($place));
-						break;
-					}
-				}
-
-				foreach (Census::allCensusPlaces() as $censusPlace) {
-					if (Soundex::compare($countryCode, Soundex::daitchMokotoff($censusPlace->censusPlace()))) {
-						foreach ($censusPlace->allCensusDates() as $census) {
-							if ($census->censusDate() == $date) {
-								foreach ($census->columns() as $column) {
-									$abbrev = $column->abbreviation();
-									if ($abbrev) {
-										$description          = $column->title() ? $column->title() : I18N::translate('Description unavailable');
-										$fmt_headers[$abbrev] = '<span title="' . $description . '">' . $abbrev . '</span>';
-									}
-								}
-								break 2;
-							}
-						}
-					}
-				}
-			}
-			// Substitute header labels and format as HTML
-			$thead = '<tr><th>' . strtr(str_replace('|', '</th><th>', $header), $fmt_headers) . '</th></tr>';
-			$thead = str_replace('.b.', '', $thead);
-
-			// Format data as HTML
-			$tbody = '';
-			foreach (explode("\n", $data) as $row) {
-				$tbody .= '<tr>';
-				foreach (explode('|', $row) as $column) {
-					$tbody .= '<td>' . $column . '</td>';
-				}
-				$tbody .= '</tr>';
-			}
-
-			return
-				$title . "\n" . // The newline allows the framework to expand the details and turn the first line into a link
-				'<div class="markdown">' .
-				'<p>' . $preamble . '</p>' .
-				'<table>' .
-				'<thead>' . $thead . '</thead>' .
-				'<tbody>' . $tbody . '</tbody>' .
-				'</table>' .
-				'<p>' . $postamble . '</p>' .
-				'</div>';
-		} else {
-			// Not a census-assistant shared note - apply default formatting
-			return Filter::formatText($note->getNote(), $WT_TREE);
-		}
-	}
-
-	/**
-	 * Generate an HTML row of data for the census header
-	 *
-	 * Add prefix cell (store XREF and drag/drop)
-	 * Add suffix cell (delete button)
-	 *
-	 * @param CensusInterface $census
-	 *
-	 * @return string
-	 */
-	public static function censusTableHeader(CensusInterface $census) {
-		$html = '';
-		foreach ($census->columns() as $column) {
-			$html .= '<th title="' . $column->title() . '">' . $column->abbreviation() . '</th>';
-		}
-
-		return '<tr><th hidden></th>' . $html . '<th></th></tr>';
-	}
-
-	/**
-	 * Generate an HTML row of data for the census
-	 *
-	 * Add prefix cell (store XREF and drag/drop)
-	 * Add suffix cell (delete button)
-	 *
-	 * @param CensusInterface $census
-	 *
-	 * @return string
-	 */
-	public static function censusTableEmptyRow(CensusInterface $census) {
-		return '<tr><td hidden></td>' . str_repeat('<td><input type="text"></td>', count($census->columns())) . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
-	}
-
-	/**
-	 * Generate an HTML row of data for the census
-	 *
-	 * Add prefix cell (store XREF and drag/drop)
-	 * Add suffix cell (delete button)
-	 *
-	 * @param CensusInterface $census
-	 * @param Individual      $individual
-	 * @param Individual|null $head
-	 *
-	 * @return string
-	 */
-	public static function censusTableRow(CensusInterface $census, Individual $individual, Individual $head = null) {
-		$html = '';
-		foreach ($census->columns() as $column) {
-			$html .= '<td><input type="text" value="' . $column->generate($individual, $head) . '"></td>';
-		}
-
-		return '<tr><td hidden>' . $individual->getXref() . '</td>' . $html . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
-	}
-
-	/**
-	 * Create a family on the census navigator.
-	 *
-	 * @param CensusInterface $census
-	 * @param Family          $family
-	 * @param Individual      $head
-	 *
-	 * @return string
-	 */
-	public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) {
-		$headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Head of household') . '"></i>';
-
-		foreach ($family->getSpouses() as $spouse) {
-			$menu = new Menu(Functions::getCloseRelationshipName($head, $spouse));
-			foreach ($spouse->getChildFamilies() as $grandparents) {
-				foreach ($grandparents->getSpouses() as $grandparent) {
-					$submenu = new Menu(
-						Functions::getCloseRelationshipName($head, $grandparent) . ' - ' . $grandparent->getFullName(),
-						'#',
-						'',
-						array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $grandparent, $head)) . '");')
-					);
-					$submenu->addClass('submenuitem', '');
-					$menu->addSubmenu($submenu);
-					$menu->addClass('', 'submenu');
-				}
-			}
-
-			?>
+    }
+
+    /**
+     * Convert custom markup into HTML
+     *
+     * @param Note $note
+     *
+     * @return string
+     */
+    public static function formatCensusNote(Note $note) {
+        global $WT_TREE;
+
+        if (preg_match('/(.*)((?:\n.*)*)\n\.start_formatted_area\.\n(.+)\n(.+(?:\n.+)*)\n.end_formatted_area\.((?:\n.*)*)/', $note->getNote(), $match)) {
+            // This looks like a census-assistant shared note
+            $title     = Filter::escapeHtml($match[1]);
+            $preamble  = Filter::escapeHtml($match[2]);
+            $header    = Filter::escapeHtml($match[3]);
+            $data      = Filter::escapeHtml($match[4]);
+            $postamble = Filter::escapeHtml($match[5]);
+
+            // Get the column headers for the census to which this note refers
+            // requires the fact place & date to match the specific census
+            // censusPlace() (Soundex match) and censusDate() functions
+            $fmt_headers   = array();
+            $linkedRecords = array_merge($note->linkedIndividuals('NOTE'), $note->linkedFamilies('NOTE'));
+            $firstRecord   = array_shift($linkedRecords);
+            if ($firstRecord) {
+                $countryCode = '';
+                $date        = '';
+                foreach ($firstRecord->getFacts('CENS') as $fact) {
+                    if (trim($fact->getAttribute('NOTE'), '@') === $note->getXref()) {
+                        $date        = $fact->getAttribute('DATE');
+                        $place       = explode(',', strip_tags($fact->getPlace()->getFullName()));
+                        $countryCode = Soundex::daitchMokotoff(array_pop($place));
+                        break;
+                    }
+                }
+
+                foreach (Census::allCensusPlaces() as $censusPlace) {
+                    if (Soundex::compare($countryCode, Soundex::daitchMokotoff($censusPlace->censusPlace()))) {
+                        foreach ($censusPlace->allCensusDates() as $census) {
+                            if ($census->censusDate() == $date) {
+                                foreach ($census->columns() as $column) {
+                                    $abbrev = $column->abbreviation();
+                                    if ($abbrev) {
+                                        $description          = $column->title() ? $column->title() : I18N::translate('Description unavailable');
+                                        $fmt_headers[$abbrev] = '<span title="' . $description . '">' . $abbrev . '</span>';
+                                    }
+                                }
+                                break 2;
+                            }
+                        }
+                    }
+                }
+            }
+            // Substitute header labels and format as HTML
+            $thead = '<tr><th>' . strtr(str_replace('|', '</th><th>', $header), $fmt_headers) . '</th></tr>';
+            $thead = str_replace('.b.', '', $thead);
+
+            // Format data as HTML
+            $tbody = '';
+            foreach (explode("\n", $data) as $row) {
+                $tbody .= '<tr>';
+                foreach (explode('|', $row) as $column) {
+                    $tbody .= '<td>' . $column . '</td>';
+                }
+                $tbody .= '</tr>';
+            }
+
+            return
+                $title . "\n" . // The newline allows the framework to expand the details and turn the first line into a link
+                '<div class="markdown">' .
+                '<p>' . $preamble . '</p>' .
+                '<table>' .
+                '<thead>' . $thead . '</thead>' .
+                '<tbody>' . $tbody . '</tbody>' .
+                '</table>' .
+                '<p>' . $postamble . '</p>' .
+                '</div>';
+        } else {
+            // Not a census-assistant shared note - apply default formatting
+            return Filter::formatText($note->getNote(), $WT_TREE);
+        }
+    }
+
+    /**
+     * Generate an HTML row of data for the census header
+     *
+     * Add prefix cell (store XREF and drag/drop)
+     * Add suffix cell (delete button)
+     *
+     * @param CensusInterface $census
+     *
+     * @return string
+     */
+    public static function censusTableHeader(CensusInterface $census) {
+        $html = '';
+        foreach ($census->columns() as $column) {
+            $html .= '<th title="' . $column->title() . '">' . $column->abbreviation() . '</th>';
+        }
+
+        return '<tr><th hidden></th>' . $html . '<th></th></tr>';
+    }
+
+    /**
+     * Generate an HTML row of data for the census
+     *
+     * Add prefix cell (store XREF and drag/drop)
+     * Add suffix cell (delete button)
+     *
+     * @param CensusInterface $census
+     *
+     * @return string
+     */
+    public static function censusTableEmptyRow(CensusInterface $census) {
+        return '<tr><td hidden></td>' . str_repeat('<td><input type="text"></td>', count($census->columns())) . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
+    }
+
+    /**
+     * Generate an HTML row of data for the census
+     *
+     * Add prefix cell (store XREF and drag/drop)
+     * Add suffix cell (delete button)
+     *
+     * @param CensusInterface $census
+     * @param Individual      $individual
+     * @param Individual|null $head
+     *
+     * @return string
+     */
+    public static function censusTableRow(CensusInterface $census, Individual $individual, Individual $head = null) {
+        $html = '';
+        foreach ($census->columns() as $column) {
+            $html .= '<td><input type="text" value="' . $column->generate($individual, $head) . '"></td>';
+        }
+
+        return '<tr><td hidden>' . $individual->getXref() . '</td>' . $html . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
+    }
+
+    /**
+     * Create a family on the census navigator.
+     *
+     * @param CensusInterface $census
+     * @param Family          $family
+     * @param Individual      $head
+     *
+     * @return string
+     */
+    public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) {
+        $headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Head of household') . '"></i>';
+
+        foreach ($family->getSpouses() as $spouse) {
+            $menu = new Menu(Functions::getCloseRelationshipName($head, $spouse));
+            foreach ($spouse->getChildFamilies() as $grandparents) {
+                foreach ($grandparents->getSpouses() as $grandparent) {
+                    $submenu = new Menu(
+                        Functions::getCloseRelationshipName($head, $grandparent) . ' - ' . $grandparent->getFullName(),
+                        '#',
+                        '',
+                        array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $grandparent, $head)) . '");')
+                    );
+                    $submenu->addClass('submenuitem', '');
+                    $menu->addSubmenu($submenu);
+                    $menu->addClass('', 'submenu');
+                }
+            }
+
+            ?>
 			<tr>
 				<td class="optionbox">
 					<?php echo $menu->getMenu(); ?>
@@ -454,38 +454,38 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-
-		foreach ($family->getChildren() as $child) {
-			$menu = new Menu(Functions::getCloseRelationshipName($head, $child));
-			foreach ($child->getSpouseFamilies() as $spouse_family) {
-				foreach ($spouse_family->getSpouses() as $spouse_family_spouse) {
-					if ($spouse_family_spouse != $child) {
-						$submenu = new Menu(
-							Functions::getCloseRelationshipName($head, $spouse_family_spouse) . ' - ' . $spouse_family_spouse->getFullName(),
-							'#',
-							'',
-							array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $spouse_family_spouse, $head)) . '");')
-						);
-						$submenu->addClass('submenuitem', '');
-						$menu->addSubmenu($submenu);
-						$menu->addClass('', 'submenu');
-					}
-				}
-				foreach ($spouse_family->getChildren() as $spouse_family_child) {
-					$submenu = new Menu(
-						Functions::getCloseRelationshipName($head, $spouse_family_child) . ' - ' . $spouse_family_child->getFullName(),
-						'#',
-						'',
-						array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $spouse_family_child, $head)) . '");')
-					);
-					$submenu->addClass('submenuitem', '');
-					$menu->addSubmenu($submenu);
-					$menu->addClass('', 'submenu');
-				}
-			}
-
-			?>
+        }
+
+        foreach ($family->getChildren() as $child) {
+            $menu = new Menu(Functions::getCloseRelationshipName($head, $child));
+            foreach ($child->getSpouseFamilies() as $spouse_family) {
+                foreach ($spouse_family->getSpouses() as $spouse_family_spouse) {
+                    if ($spouse_family_spouse != $child) {
+                        $submenu = new Menu(
+                            Functions::getCloseRelationshipName($head, $spouse_family_spouse) . ' - ' . $spouse_family_spouse->getFullName(),
+                            '#',
+                            '',
+                            array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $spouse_family_spouse, $head)) . '");')
+                        );
+                        $submenu->addClass('submenuitem', '');
+                        $menu->addSubmenu($submenu);
+                        $menu->addClass('', 'submenu');
+                    }
+                }
+                foreach ($spouse_family->getChildren() as $spouse_family_child) {
+                    $submenu = new Menu(
+                        Functions::getCloseRelationshipName($head, $spouse_family_child) . ' - ' . $spouse_family_child->getFullName(),
+                        '#',
+                        '',
+                        array('onclick' => 'return appendCensusRow("' . Filter::escapeJs(self::censusTableRow($census, $spouse_family_child, $head)) . '");')
+                    );
+                    $submenu->addClass('submenuitem', '');
+                    $menu->addSubmenu($submenu);
+                    $menu->addClass('', 'submenu');
+                }
+            }
+
+            ?>
 			<tr>
 				<td class="optionbox">
 					<?php echo $menu->getMenu(); ?>
@@ -504,7 +504,7 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-		echo '<tr><td><br></td></tr>';
-	}
+        }
+        echo '<tr><td><br></td></tr>';
+    }
 }

Switch Indentation +11 added lines, -11 removed lines

@@ -52,17 +52,17 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'census_find':
-			self::censusFind();
-			break;
-		case 'media_find':
-			self::mediaFind();
-			break;
-		case 'media_query_3a':
-			self::mediaQuery();
-			break;
-		default:
-			http_response_code(404);
+		    case 'census_find':
+			    self::censusFind();
+			    break;
+		    case 'media_find':
+			    self::mediaFind();
+			    break;
+		    case 'media_query_3a':
+			    self::mediaQuery();
+			    break;
+		    default:
+			    http_response_code(404);
 		}
 	}
 

Braces +24 added lines, -12 removed lines

@@ -33,14 +33,17 @@ 
 /**
  * Class CensusAssistantModule
  */
-class CensusAssistantModule extends AbstractModule {
+class CensusAssistantModule extends AbstractModule
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Census assistant');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Census assistant” module */ I18N::translate('An alternative way to enter census transcripts and link them to individuals.');
 	}
 
@@ -50,7 +53,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'census_find':
 			self::censusFind();
@@ -69,7 +73,8 @@ 
 	/**
 	 * Find an individual.
 	 */
-	private static function censusFind() {
+	private static function censusFind()
+	{
 		global $WT_TREE;
 
 		$controller = new SimpleController;
@@ -126,7 +131,8 @@ 
 	/**
 	 * Find a media object.
 	 */
-	private static function mediaFind() {
+	private static function mediaFind()
+	{
 		global $WT_TREE;
 
 		$controller = new SimpleController;
@@ -224,7 +230,8 @@ 
 	/**
 	 * Search for a media object.
 	 */
-	private static function mediaQuery() {
+	private static function mediaQuery()
+	{
 		global $WT_TREE;
 
 		$iid2 = Filter::get('iid', WT_REGEX_XREF);
@@ -277,7 +284,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function formatCensusNote(Note $note) {
+	public static function formatCensusNote(Note $note)
+	{
 		global $WT_TREE;
 
 		if (preg_match('/(.*)((?:\n.*)*)\n\.start_formatted_area\.\n(.+)\n(.+(?:\n.+)*)\n.end_formatted_area\.((?:\n.*)*)/', $note->getNote(), $match)) {
@@ -363,7 +371,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function censusTableHeader(CensusInterface $census) {
+	public static function censusTableHeader(CensusInterface $census)
+	{
 		$html = '';
 		foreach ($census->columns() as $column) {
 			$html .= '<th title="' . $column->title() . '">' . $column->abbreviation() . '</th>';
@@ -382,7 +391,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function censusTableEmptyRow(CensusInterface $census) {
+	public static function censusTableEmptyRow(CensusInterface $census)
+	{
 		return '<tr><td hidden></td>' . str_repeat('<td><input type="text"></td>', count($census->columns())) . '<td><a class="icon-remove" href="#" title="' . I18N::translate('Remove') . '"></a></td></tr>';
 	}
 
@@ -398,7 +408,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function censusTableRow(CensusInterface $census, Individual $individual, Individual $head = null) {
+	public static function censusTableRow(CensusInterface $census, Individual $individual, Individual $head = null)
+	{
 		$html = '';
 		foreach ($census->columns() as $column) {
 			$html .= '<td><input type="text" value="' . $column->generate($individual, $head) . '"></td>';
@@ -416,7 +427,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) {
+	public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head)
+	{
 		$headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Head of household') . '"></i>';
 
 		foreach ($family->getSpouses() as $spouse) {

app/Module/FamilyTreeNews/Schema/Migration2.php

Indentation +19 added lines, -19 removed lines

@@ -23,24 +23,24 @@
  * Upgrade the database schema from version 2 to version 3.
  */
 class Migration2 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Delete any data that might violate the new constraints
-		Database::exec(
-			"DELETE FROM `##news`" .
-			" WHERE user_id   NOT IN (SELECT user_id   FROM `##user`  )" .
-			" OR    gedcom_id NOT IN (SELECT gedcom_id FROM `##gedcom`)"
-		);
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Delete any data that might violate the new constraints
+        Database::exec(
+            "DELETE FROM `##news`" .
+            " WHERE user_id   NOT IN (SELECT user_id   FROM `##user`  )" .
+            " OR    gedcom_id NOT IN (SELECT gedcom_id FROM `##gedcom`)"
+        );
 
-		// Add the new constraints
-		try {
-			Database::exec(
-				"ALTER TABLE `##news`" .
-				" ADD FOREIGN KEY `##news_fk1` (user_id  ) REFERENCES `##user`   (user_id)   ON DELETE CASCADE," .
-				" ADD FOREIGN KEY `##news_fk2` (gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE"
-			);
-		} catch (PDOException $ex) {
-			// Already updated?
-		}
-	}
+        // Add the new constraints
+        try {
+            Database::exec(
+                "ALTER TABLE `##news`" .
+                " ADD FOREIGN KEY `##news_fk1` (user_id  ) REFERENCES `##user`   (user_id)   ON DELETE CASCADE," .
+                " ADD FOREIGN KEY `##news_fk2` (gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE"
+            );
+        } catch (PDOException $ex) {
+            // Already updated?
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -22,9 +22,11 @@
 /**
  * Upgrade the database schema from version 2 to version 3.
  */
-class Migration2 implements MigrationInterface {
+class Migration2 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Delete any data that might violate the new constraints
 		Database::exec(
 			"DELETE FROM `##news`" .

app/Module/FamilyTreeNews/Schema/Migration1.php

Indentation +44 added lines, -44 removed lines

@@ -23,54 +23,54 @@
  * Upgrade the database schema from version 1 to version 2.
  */
 class Migration1 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Add new columns
-		try {
-			Database::exec(
-				"ALTER TABLE `##news`" .
-				" ADD user_id INTEGER NULL AFTER n_id," .
-				" ADD gedcom_id INTEGER NULL AFTER user_id," .
-				" ADD updated TIMESTAMP ON UPDATE CURRENT_TIMESTAMP DEFAULT CURRENT_TIMESTAMP," .
-				" ADD KEY news_ix1 (user_id, updated)," .
-				" ADD KEY news_ix2 (gedcom_id, updated)"
-			);
-		} catch (PDOException $ex) {
-			// Already updated?
-		}
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Add new columns
+        try {
+            Database::exec(
+                "ALTER TABLE `##news`" .
+                " ADD user_id INTEGER NULL AFTER n_id," .
+                " ADD gedcom_id INTEGER NULL AFTER user_id," .
+                " ADD updated TIMESTAMP ON UPDATE CURRENT_TIMESTAMP DEFAULT CURRENT_TIMESTAMP," .
+                " ADD KEY news_ix1 (user_id, updated)," .
+                " ADD KEY news_ix2 (gedcom_id, updated)"
+            );
+        } catch (PDOException $ex) {
+            // Already updated?
+        }
 
 // Migrate data from the old columns to the new ones
-		try {
-			Database::exec(
-				"UPDATE `##news` n" .
-				" LEFT JOIN `##gedcom` g ON (n.n_username=g.gedcom_name)" .
-				" LEFT JOIN `##user` u ON (n.n_username=u.user_name)" .
-				" SET n.gedcom_id=g.gedcom_id, n.user_id=u.user_id, updated=FROM_UNIXTIME(n_date)"
-			);
-		} catch (PDOException $ex) {
-			// Already updated?
-		}
+        try {
+            Database::exec(
+                "UPDATE `##news` n" .
+                " LEFT JOIN `##gedcom` g ON (n.n_username=g.gedcom_name)" .
+                " LEFT JOIN `##user` u ON (n.n_username=u.user_name)" .
+                " SET n.gedcom_id=g.gedcom_id, n.user_id=u.user_id, updated=FROM_UNIXTIME(n_date)"
+            );
+        } catch (PDOException $ex) {
+            // Already updated?
+        }
 
 // Delete orphaned rows
-		try {
-			Database::exec(
-				"DELETE FROM `##news` WHERE user_id IS NULL AND gedcom_id IS NULL"
-			);
-		} catch (PDOException $ex) {
-			// Already updated?
-		}
+        try {
+            Database::exec(
+                "DELETE FROM `##news` WHERE user_id IS NULL AND gedcom_id IS NULL"
+            );
+        } catch (PDOException $ex) {
+            // Already updated?
+        }
 
 // Delete/rename old columns
-		try {
-			Database::exec(
-				"ALTER TABLE `##news`" .
-				" DROP n_username, DROP n_date," .
-				" CHANGE n_id news_id INTEGER NOT NULL AUTO_INCREMENT," .
-				" CHANGE n_title subject VARCHAR(255) COLLATE utf8_unicode_ci," .
-				" CHANGE n_text body TEXT COLLATE utf8_unicode_ci"
-			);
-		} catch (PDOException $ex) {
-			// Already updated?
-		}
-	}
+        try {
+            Database::exec(
+                "ALTER TABLE `##news`" .
+                " DROP n_username, DROP n_date," .
+                " CHANGE n_id news_id INTEGER NOT NULL AUTO_INCREMENT," .
+                " CHANGE n_title subject VARCHAR(255) COLLATE utf8_unicode_ci," .
+                " CHANGE n_text body TEXT COLLATE utf8_unicode_ci"
+            );
+        } catch (PDOException $ex) {
+            // Already updated?
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -22,9 +22,11 @@
 /**
  * Upgrade the database schema from version 1 to version 2.
  */
-class Migration1 implements MigrationInterface {
+class Migration1 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Add new columns
 		try {
 			Database::exec(

app/Module/FamilyTreeNews/Schema/Migration0.php

Indentation +14 added lines, -14 removed lines

@@ -22,18 +22,18 @@
  * Upgrade the database schema from version 0 (empty database) to version 1.
  */
 class Migration0 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		Database::exec(
-			"CREATE TABLE IF NOT EXISTS `##news` (" .
-			" n_id       INTEGER AUTO_INCREMENT NOT NULL," .
-			" n_username VARCHAR(100)           NOT NULL," .
-			" n_date     INTEGER                NOT NULL," .
-			" n_title    VARCHAR(255)           NOT NULL," .
-			" n_text     TEXT                   NOT NULL," .
-			" PRIMARY KEY     (n_id)," .
-			"         KEY ix1 (n_username)" .
-			") COLLATE utf8_unicode_ci ENGINE=InnoDB"
-		);
-	}
+    /** {@inheritDoc} */
+    public function upgrade() {
+        Database::exec(
+            "CREATE TABLE IF NOT EXISTS `##news` (" .
+            " n_id       INTEGER AUTO_INCREMENT NOT NULL," .
+            " n_username VARCHAR(100)           NOT NULL," .
+            " n_date     INTEGER                NOT NULL," .
+            " n_title    VARCHAR(255)           NOT NULL," .
+            " n_text     TEXT                   NOT NULL," .
+            " PRIMARY KEY     (n_id)," .
+            "         KEY ix1 (n_username)" .
+            ") COLLATE utf8_unicode_ci ENGINE=InnoDB"
+        );
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,9 +21,11 @@
 /**
  * Upgrade the database schema from version 0 (empty database) to version 1.
  */
-class Migration0 implements MigrationInterface {
+class Migration0 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		Database::exec(
 			"CREATE TABLE IF NOT EXISTS `##news` (" .
 			" n_id       INTEGER AUTO_INCREMENT NOT NULL," .

app/Module/ModuleTabInterface.php

Indentation +40 added lines, -40 removed lines

@@ -19,49 +19,49 @@
  * Interface ModuleTabInterface - Classes and libraries for module system
  */
 interface ModuleTabInterface {
-	/**
-	 * 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();
+    /**
+     * 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();
 
-	/**
-	 * Generate the HTML content of this tab.
-	 *
-	 * @return string
-	 */
-	public function getTabContent();
+    /**
+     * Generate the HTML content of this tab.
+     *
+     * @return string
+     */
+    public function getTabContent();
 
-	/**
-	 * Is this tab empty? If so, we don't always need to display it.
-	 *
-	 * @return bool
-	 */
-	public function hasTabContent();
+    /**
+     * Is this tab empty? If so, we don't always need to display it.
+     *
+     * @return bool
+     */
+    public function hasTabContent();
 
-	/**
-	 * Can this tab load asynchronously?
-	 *
-	 * @return bool
-	 */
-	public function canLoadAjax();
+    /**
+     * Can this tab load asynchronously?
+     *
+     * @return bool
+     */
+    public function canLoadAjax();
 
-	/**
-	 * 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();
+    /**
+     * 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();
 
-	/**
-	 * A greyed out tab has no actual content, but may perhaps have
-	 * options to create content.
-	 *
-	 * @return bool
-	 */
-	public function isGrayedOut();
+    /**
+     * A greyed out tab has no actual content, but may perhaps have
+     * options to create content.
+     *
+     * @return bool
+     */
+    public function isGrayedOut();
 }

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Interface ModuleTabInterface - Classes and libraries for module system
  */
-interface ModuleTabInterface {
+interface ModuleTabInterface
+{
 	/**
 	 * The user can re-arrange the tab order, but until they do, this
 	 * is the order in which tabs are shown.

app/Module/RelativesTabModule.php

Indentation +225 added lines, -225 removed lines

@@ -28,86 +28,86 @@ 
  * Class RelativesTabModule
  */
 class RelativesTabModule extends AbstractModule implements ModuleTabInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Families');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Families');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “Families” module */ I18N::translate('A tab showing the close relatives of an individual.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “Families” module */ I18N::translate('A tab showing the close relatives of an individual.');
+    }
 
-	/**
-	 * 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 20;
-	}
+    /**
+     * 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 20;
+    }
 
-	/**
-	 * Display the age difference between marriages and the births of children.
-	 *
-	 * @param Date $prev
-	 * @param Date $next
-	 * @param int  $child_number
-	 *
-	 * @return string
-	 */
-	private static function ageDifference(Date $prev, Date $next, $child_number = 0) {
-		if ($prev->isOK() && $next->isOK()) {
-			$days = $next->maximumJulianDay() - $prev->minimumJulianDay();
-			if ($days < 0) {
-				// Show warning triangle if dates in reverse order
-				$diff = '<i class="icon-warning"></i> ';
-			} elseif ($child_number > 1 && $days > 1 && $days < 240) {
-				// Show warning triangle if children born too close together
-				$diff = '<i class="icon-warning"></i> ';
-			} else {
-				$diff = '';
-			}
+    /**
+     * Display the age difference between marriages and the births of children.
+     *
+     * @param Date $prev
+     * @param Date $next
+     * @param int  $child_number
+     *
+     * @return string
+     */
+    private static function ageDifference(Date $prev, Date $next, $child_number = 0) {
+        if ($prev->isOK() && $next->isOK()) {
+            $days = $next->maximumJulianDay() - $prev->minimumJulianDay();
+            if ($days < 0) {
+                // Show warning triangle if dates in reverse order
+                $diff = '<i class="icon-warning"></i> ';
+            } elseif ($child_number > 1 && $days > 1 && $days < 240) {
+                // Show warning triangle if children born too close together
+                $diff = '<i class="icon-warning"></i> ';
+            } else {
+                $diff = '';
+            }
 
-			$months = round($days * 12 / 365.25); // Approximate - we do not know the calendar
-			if (abs($months) == 12 || abs($months) >= 24) {
-				$diff .= I18N::plural('%s year', '%s years', round($months / 12), I18N::number(round($months / 12)));
-			} elseif ($months != 0) {
-				$diff .= I18N::plural('%s month', '%s months', $months, I18N::number($months));
-			}
+            $months = round($days * 12 / 365.25); // Approximate - we do not know the calendar
+            if (abs($months) == 12 || abs($months) >= 24) {
+                $diff .= I18N::plural('%s year', '%s years', round($months / 12), I18N::number(round($months / 12)));
+            } elseif ($months != 0) {
+                $diff .= I18N::plural('%s month', '%s months', $months, I18N::number($months));
+            }
 
-			return '<div class="elderdate age">' . $diff . '</div>';
-		} else {
-			return '';
-		}
-	}
+            return '<div class="elderdate age">' . $diff . '</div>';
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Print a family group.
-	 *
-	 * @param Family $family
-	 * @param string $type
-	 * @param string $label
-	 */
-	private function printFamily(Family $family, $type, $label) {
-		global $controller;
+    /**
+     * Print a family group.
+     *
+     * @param Family $family
+     * @param string $type
+     * @param string $label
+     */
+    private function printFamily(Family $family, $type, $label) {
+        global $controller;
 
-		if ($family->getTree()->getPreference('SHOW_PRIVATE_RELATIONSHIPS')) {
-			$access_level = Auth::PRIV_HIDE;
-		} else {
-			$access_level = Auth::accessLevel($family->getTree());
-		}
+        if ($family->getTree()->getPreference('SHOW_PRIVATE_RELATIONSHIPS')) {
+            $access_level = Auth::PRIV_HIDE;
+        } else {
+            $access_level = Auth::accessLevel($family->getTree());
+        }
 
-		?>
+        ?>
 		<table>
 			<tr>
 				<td>
@@ -122,20 +122,20 @@ 
 		<table class="facts_table">
 		<?php
 
-		///// HUSB /////
-		$found = false;
-		foreach ($family->getFacts('HUSB', false, $access_level) as $fact) {
-			$found |= !$fact->isPendingDeletion();
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				if ($fact->isPendingAddition()) {
-					$class = 'facts_label new';
-				} elseif ($fact->isPendingDeletion()) {
-					$class = 'facts_label old';
-				} else {
-					$class = 'facts_label';
-				}
-				?>
+        ///// HUSB /////
+        $found = false;
+        foreach ($family->getFacts('HUSB', false, $access_level) as $fact) {
+            $found |= !$fact->isPendingDeletion();
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                if ($fact->isPendingAddition()) {
+                    $class = 'facts_label new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $class = 'facts_label old';
+                } else {
+                    $class = 'facts_label';
+                }
+                ?>
 					<tr>
 					<td class="<?php echo $class; ?>">
 						<?php echo Functions::getCloseRelationshipName($controller->record, $person); ?>
@@ -145,31 +145,31 @@ 
 					</td>
 					</tr>
 				<?php
-			}
-		}
-		if (!$found && $family->canEdit()) {
-			?>
+            }
+        }
+        if (!$found && $family->canEdit()) {
+            ?>
 			<tr>
 				<td class="facts_label"></td>
 				<td class="facts_value"><a href="#" onclick="return add_spouse_to_family('<?php echo $family->getXref(); ?>', 'HUSB');"><?php echo I18N::translate('Add a husband to this family'); ?></a></td>
 			</tr>
 			<?php
-		}
+        }
 
-		///// WIFE /////
-		$found = false;
-		foreach ($family->getFacts('WIFE', false, $access_level) as $fact) {
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				$found |= !$fact->isPendingDeletion();
-				if ($fact->isPendingAddition()) {
-					$class = 'facts_label new';
-				} elseif ($fact->isPendingDeletion()) {
-					$class = 'facts_label old';
-				} else {
-					$class = 'facts_label';
-				}
-				?>
+        ///// WIFE /////
+        $found = false;
+        foreach ($family->getFacts('WIFE', false, $access_level) as $fact) {
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                $found |= !$fact->isPendingDeletion();
+                if ($fact->isPendingAddition()) {
+                    $class = 'facts_label new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $class = 'facts_label old';
+                } else {
+                    $class = 'facts_label';
+                }
+                ?>
 				<tr>
 					<td class="<?php echo $class; ?>">
 						<?php echo Functions::getCloseRelationshipName($controller->record, $person); ?>
@@ -179,30 +179,30 @@ 
 					</td>
 				</tr>
 				<?php
-			}
-		}
-		if (!$found && $family->canEdit()) {
-			?>
+            }
+        }
+        if (!$found && $family->canEdit()) {
+            ?>
 			<tr>
 				<td class="facts_label"></td>
 				<td class="facts_value"><a href="#" onclick="return add_spouse_to_family('<?php echo $family->getXref(); ?>', 'WIFE');"><?php echo I18N::translate('Add a wife to this family'); ?></a></td>
 			</tr>
 			<?php
-		}
+        }
 
-		///// MARR /////
-		$found = false;
-		$prev  = new Date('');
-		foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
-			$found |= !$fact->isPendingDeletion();
-			if ($fact->isPendingAddition()) {
-				$class = ' new';
-			} elseif ($fact->isPendingDeletion()) {
-				$class = ' old';
-			} else {
-				$class = '';
-			}
-			?>
+        ///// MARR /////
+        $found = false;
+        $prev  = new Date('');
+        foreach ($family->getFacts(WT_EVENTS_MARR . '|' . WT_EVENTS_DIV, true) as $fact) {
+            $found |= !$fact->isPendingDeletion();
+            if ($fact->isPendingAddition()) {
+                $class = ' new';
+            } elseif ($fact->isPendingDeletion()) {
+                $class = ' old';
+            } else {
+                $class = '';
+            }
+            ?>
 			<tr>
 				<td class="facts_label">
 				</td>
@@ -211,13 +211,13 @@ 
 				</td>
 			</tr>
 			<?php
-			if (!$prev->isOK() && $fact->getDate()->isOK()) {
-				$prev = $fact->getDate();
-			}
-		}
-		if (!$found && $family->canShow() && $family->canEdit()) {
-			// Add a new marriage
-			?>
+            if (!$prev->isOK() && $fact->getDate()->isOK()) {
+                $prev = $fact->getDate();
+            }
+        }
+        if (!$found && $family->canShow() && $family->canEdit()) {
+            // Add a new marriage
+            ?>
 			<tr>
 				<td class="facts_label">
 				</td>
@@ -228,30 +228,30 @@ 
 				</td>
 			</tr>
 			<?php
-		}
+        }
 
-		///// CHIL /////
-		$child_number = 0;
-		foreach ($family->getFacts('CHIL', false, $access_level) as $fact) {
-			$person = $fact->getTarget();
-			if ($person instanceof Individual) {
-				if ($fact->isPendingAddition()) {
-					$child_number++;
-					$class = 'facts_label new';
-				} elseif ($fact->isPendingDeletion()) {
-					$class = 'facts_label old';
-				} else {
-					$child_number++;
-					$class = 'facts_label';
-				}
-				$next = new Date('');
-				foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
-					if ($bfact->getDate()->isOK()) {
-						$next = $bfact->getDate();
-						break;
-					}
-				}
-				?>
+        ///// CHIL /////
+        $child_number = 0;
+        foreach ($family->getFacts('CHIL', false, $access_level) as $fact) {
+            $person = $fact->getTarget();
+            if ($person instanceof Individual) {
+                if ($fact->isPendingAddition()) {
+                    $child_number++;
+                    $class = 'facts_label new';
+                } elseif ($fact->isPendingDeletion()) {
+                    $class = 'facts_label old';
+                } else {
+                    $child_number++;
+                    $class = 'facts_label';
+                }
+                $next = new Date('');
+                foreach ($person->getFacts(WT_EVENTS_BIRT, true) as $bfact) {
+                    if ($bfact->getDate()->isOK()) {
+                        $next = $bfact->getDate();
+                        break;
+                    }
+                }
+                ?>
 				<tr>
 					<td class="<?php echo $class; ?>">
 						<?php echo self::ageDifference($prev, $next, $child_number); ?>
@@ -262,17 +262,17 @@ 
 					</td>
 				</tr>
 				<?php
-				$prev = $next;
-			}
-		}
-		// Re-order children / add a new child
-		if ($family->canEdit()) {
-			if ($type == 'FAMS') {
-				$add_child_text = I18N::translate('Add a son or daughter');
-			} else {
-				$add_child_text = I18N::translate('Add a brother or sister');
-			}
-			?>
+                $prev = $next;
+            }
+        }
+        // Re-order children / add a new child
+        if ($family->canEdit()) {
+            if ($type == 'FAMS') {
+                $add_child_text = I18N::translate('Add a son or daughter');
+            } else {
+                $add_child_text = I18N::translate('Add a brother or sister');
+            }
+            ?>
 			<tr class="noprint">
 				<td class="facts_label">
 					<?php if (count($family->getChildren()) > 1) { ?>
@@ -288,25 +288,25 @@ 
 				</td>
 			</tr>
 			<?php
-		}
+        }
 
-		echo '</table>';
+        echo '</table>';
 
-		return;
-	}
+        return;
+    }
 
-	/** {@inheritdoc} */
-	public function getTabContent() {
-		global $show_full, $controller;
+    /** {@inheritdoc} */
+    public function getTabContent() {
+        global $show_full, $controller;
 
-		if (isset($show_full)) {
-			$saved_show_full = $show_full;
-		}
-		// We always want to see full details here
-		$show_full = 1;
+        if (isset($show_full)) {
+            $saved_show_full = $show_full;
+        }
+        // We always want to see full details here
+        $show_full = 1;
 
-		ob_start();
-		?>
+        ob_start();
+        ?>
 		<table class="facts_table">
 			<tr class="noprint">
 				<td class="descriptionbox rela">
@@ -318,9 +318,9 @@ 
 			</tr>
 		</table>
 		<?php
-		$families = $controller->record->getChildFamilies();
-		if (!$families && $controller->record->canEdit()) {
-			?>
+        $families = $controller->record->getChildFamilies();
+        if (!$families && $controller->record->canEdit()) {
+            ?>
 			<table class="facts_table">
 				<tr>
 					<td class="facts_value"><a href="#" onclick="return add_parent_to_individual('<?php echo $controller->record->getXref(); ?>', 'M');"><?php echo I18N::translate('Add a father'); ?></td>
@@ -330,34 +330,34 @@ 
 				</tr>
 			</table>
 			<?php
-		}
+        }
 
-		// parents
-		foreach ($families as $family) {
-			$this->printFamily($family, 'FAMC', $controller->record->getChildFamilyLabel($family));
-		}
+        // parents
+        foreach ($families as $family) {
+            $this->printFamily($family, 'FAMC', $controller->record->getChildFamilyLabel($family));
+        }
 
-		// step-parents
-		foreach ($controller->record->getChildStepFamilies() as $family) {
-			$this->printFamily($family, 'FAMC', $controller->record->getStepFamilyLabel($family));
-		}
+        // step-parents
+        foreach ($controller->record->getChildStepFamilies() as $family) {
+            $this->printFamily($family, 'FAMC', $controller->record->getStepFamilyLabel($family));
+        }
 
-		// spouses
-		$families = $controller->record->getSpouseFamilies();
-		foreach ($families as $family) {
-			$this->printFamily($family, 'FAMS', $controller->getSpouseFamilyLabel($family, $controller->record));
-		}
+        // spouses
+        $families = $controller->record->getSpouseFamilies();
+        foreach ($families as $family) {
+            $this->printFamily($family, 'FAMS', $controller->getSpouseFamilyLabel($family, $controller->record));
+        }
 
-		// step-children
-		foreach ($controller->record->getSpouseStepFamilies() as $family) {
-			$this->printFamily($family, 'FAMS', $family->getFullName());
-		}
+        // step-children
+        foreach ($controller->record->getSpouseStepFamilies() as $family) {
+            $this->printFamily($family, 'FAMS', $family->getFullName());
+        }
 
-		if ($controller->record->canEdit()) {
-		?>
+        if ($controller->record->canEdit()) {
+        ?>
 		<br><table class="facts_table noprint">
 		<?php
-			if (count($families) > 1) { ?>
+            if (count($families) > 1) { ?>
 			<tr>
 				<td class="facts_value">
 				<a href="#" onclick="return reorder_families('<?php echo $controller->record->getXref(); ?>');"><?php echo I18N::translate('Re-order families'); ?></a>
@@ -381,7 +381,7 @@ 
 				</td>
 			</tr>
 			<?php }
-			if ($controller->record->getSex() != "M") { ?>
+            if ($controller->record->getSex() != "M") { ?>
 			<tr>
 				<td class="facts_value">
 				<a href="#" onclick="return add_spouse_to_individual('<?php echo $controller->record->getXref(); ?>','HUSB');"><?php echo I18N::translate('Add a husband'); ?></a>
@@ -406,29 +406,29 @@ 
 		</script>
 		<?php
 
-		unset($show_full);
-		if (isset($saved_show_full)) {
-			$show_full = $saved_show_full;
-		}
+        unset($show_full);
+        if (isset($saved_show_full)) {
+            $show_full = $saved_show_full;
+        }
 
-		return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
-	}
+        return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
+    }
 
-	/** {@inheritdoc} */
-	public function hasTabContent() {
-		return true;
-	}
-	/** {@inheritdoc} */
-	public function isGrayedOut() {
-		return false;
-	}
-	/** {@inheritdoc} */
-	public function canLoadAjax() {
-		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
-	}
+    /** {@inheritdoc} */
+    public function hasTabContent() {
+        return true;
+    }
+    /** {@inheritdoc} */
+    public function isGrayedOut() {
+        return false;
+    }
+    /** {@inheritdoc} */
+    public function canLoadAjax() {
+        return !Auth::isSearchEngine(); // Search engines cannot use AJAX
+    }
 
-	/** {@inheritdoc} */
-	public function getPreLoadContent() {
-		return '';
-	}
+    /** {@inheritdoc} */
+    public function getPreLoadContent() {
+        return '';
+    }
 }

Braces +22 added lines, -11 removed lines

@@ -27,13 +27,15 @@ 
 /**
  * Class RelativesTabModule
  */
-class RelativesTabModule extends AbstractModule implements ModuleTabInterface {
+class RelativesTabModule extends AbstractModule implements ModuleTabInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Families');
 	}
 
@@ -42,7 +44,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Families” module */ I18N::translate('A tab showing the close relatives of an individual.');
 	}
 
@@ -52,7 +55,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 20;
 	}
 
@@ -65,7 +69,8 @@ 
 	 *
 	 * @return string
 	 */
-	private static function ageDifference(Date $prev, Date $next, $child_number = 0) {
+	private static function ageDifference(Date $prev, Date $next, $child_number = 0)
+	{
 		if ($prev->isOK() && $next->isOK()) {
 			$days = $next->maximumJulianDay() - $prev->minimumJulianDay();
 			if ($days < 0) {
@@ -98,7 +103,8 @@ 
 	 * @param string $type
 	 * @param string $label
 	 */
-	private function printFamily(Family $family, $type, $label) {
+	private function printFamily(Family $family, $type, $label)
+	{
 		global $controller;
 
 		if ($family->getTree()->getPreference('SHOW_PRIVATE_RELATIONSHIPS')) {
@@ -296,7 +302,8 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $show_full, $controller;
 
 		if (isset($show_full)) {
@@ -415,20 +422,24 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		return true;
 	}
 	/** {@inheritdoc} */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		return false;
 	}
 	/** {@inheritdoc} */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
 	}
 
 	/** {@inheritdoc} */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		return '';
 	}
 }