fisharebest / webtrees

app/Module/IndividualSidebarModule.php

Indentation +171 added lines, -171 removed lines

@@ -28,75 +28,75 @@ 
  * Class IndividualSidebarModule
  */
 class IndividualSidebarModule extends AbstractModule implements ModuleSidebarInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Individual list');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Individual list');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of “Individuals” module */ I18N::translate('A sidebar showing an alphabetic list of all the individuals in the family tree.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of “Individuals” module */ I18N::translate('A sidebar showing an alphabetic list of all the individuals in the family tree.');
+    }
 
-	/**
-	 * 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 'ajax':
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $this->getSidebarAjaxContent();
-			break;
-		default:
-			http_response_code(404);
-			break;
-		}
-	}
+    /**
+     * 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 'ajax':
+            header('Content-Type: text/html; charset=UTF-8');
+            echo $this->getSidebarAjaxContent();
+            break;
+        default:
+            http_response_code(404);
+            break;
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
-		return 40;
-	}
+    /** {@inheritdoc} */
+    public function defaultSidebarOrder() {
+        return 40;
+    }
 
-	/** {@inheritdoc} */
-	public function hasSidebarContent() {
-		return !Auth::isSearchEngine();
-	}
+    /** {@inheritdoc} */
+    public function hasSidebarContent() {
+        return !Auth::isSearchEngine();
+    }
 
-	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
-		global $WT_TREE;
+    /** {@inheritdoc} */
+    public function getSidebarAjaxContent() {
+        global $WT_TREE;
 
-		$alpha   = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
-		$surname = Filter::get('surname'); // All indis with this surname.
-		$search  = Filter::get('search');
+        $alpha   = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
+        $surname = Filter::get('surname'); // All indis with this surname.
+        $search  = Filter::get('search');
 
-		if ($search) {
-			return $this->search($WT_TREE, $search);
-		} elseif ($alpha == '@' || $alpha == ',' || $surname) {
-			return $this->getSurnameIndis($WT_TREE, $alpha, $surname);
-		} elseif ($alpha) {
-			return $this->getAlphaSurnames($WT_TREE, $alpha);
-		} else {
-			return '';
-		}
-	}
+        if ($search) {
+            return $this->search($WT_TREE, $search);
+        } elseif ($alpha == '@' || $alpha == ',' || $surname) {
+            return $this->getSurnameIndis($WT_TREE, $alpha, $surname);
+        } elseif ($alpha) {
+            return $this->getAlphaSurnames($WT_TREE, $alpha);
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Load this sidebar synchronously.
-	 *
-	 * @return string
-	 */
-	public function getSidebarContent() {
-		global $controller, $WT_TREE;
+    /**
+     * Load this sidebar synchronously.
+     *
+     * @return string
+     */
+    public function getSidebarContent() {
+        global $controller, $WT_TREE;
 
-		// Fetch a list of the initial letters of all surnames in the database
-		$initials = QueryName::surnameAlpha($WT_TREE, true, false, false);
+        // Fetch a list of the initial letters of all surnames in the database
+        $initials = QueryName::surnameAlpha($WT_TREE, true, false, false);
 
-		$controller->addInlineJavascript('
+        $controller->addInlineJavascript('
 			var loadedNames = new Array();
 
 			function isearchQ() {
@@ -147,125 +147,125 @@ 
 			});
 		');
 
-		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="' . I18N::translate('Search') . '"><p>';
-		foreach ($initials as $letter => $count) {
-			switch ($letter) {
-			case '@':
-				$html = I18N::translateContext('Unknown surname', '…');
-				break;
-			case ',':
-				$html = I18N::translate('None');
-				break;
-			case ' ':
-				$html = '&nbsp;';
-				break;
-			default:
-				$html = $letter;
-				break;
-			}
-			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_indi_letter">' . $html . '</a>';
-			$out .= $html . " ";
-		}
+        $out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="' . I18N::translate('Search') . '"><p>';
+        foreach ($initials as $letter => $count) {
+            switch ($letter) {
+            case '@':
+                $html = I18N::translateContext('Unknown surname', '…');
+                break;
+            case ',':
+                $html = I18N::translate('None');
+                break;
+            case ' ':
+                $html = '&nbsp;';
+                break;
+            default:
+                $html = $letter;
+                break;
+            }
+            $html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_indi_letter">' . $html . '</a>';
+            $out .= $html . " ";
+        }
 
-		$out .= '</p>';
-		$out .= '<div id="sb_indi_content">';
-		$out .= '</div></form>';
+        $out .= '</p>';
+        $out .= '<div id="sb_indi_content">';
+        $out .= '</div></form>';
 
-		return $out;
-	}
+        return $out;
+    }
 
-	/**
-	 * Get the initial letters of surnames.
-	 *
-	 * @param Tree   $tree
-	 * @param string $alpha
-	 *
-	 * @return string
-	 */
-	private function getAlphaSurnames(Tree $tree, $alpha) {
-		$surnames = QueryName::surnames($tree, '', $alpha, true, false);
-		$out      = '<ul>';
-		foreach (array_keys($surnames) as $surname) {
-			$out .= '<li class="sb_indi_surname_li"><a href="#" data-surname="' . Filter::escapeHtml($surname) . '" data-alpha="' . Filter::escapeHtml($alpha) . '" class="sb_indi_surname">' . Filter::escapeHtml($surname) . '</a>';
-			$out .= '<div class="name_tree_div"></div>';
-			$out .= '</li>';
-		}
-		$out .= '</ul>';
+    /**
+     * Get the initial letters of surnames.
+     *
+     * @param Tree   $tree
+     * @param string $alpha
+     *
+     * @return string
+     */
+    private function getAlphaSurnames(Tree $tree, $alpha) {
+        $surnames = QueryName::surnames($tree, '', $alpha, true, false);
+        $out      = '<ul>';
+        foreach (array_keys($surnames) as $surname) {
+            $out .= '<li class="sb_indi_surname_li"><a href="#" data-surname="' . Filter::escapeHtml($surname) . '" data-alpha="' . Filter::escapeHtml($alpha) . '" class="sb_indi_surname">' . Filter::escapeHtml($surname) . '</a>';
+            $out .= '<div class="name_tree_div"></div>';
+            $out .= '</li>';
+        }
+        $out .= '</ul>';
 
-		return $out;
-	}
+        return $out;
+    }
 
-	/**
-	 * Format a list of individuals.
-	 *
-	 * @param Tree   $tree
-	 * @param string $alpha
-	 * @param string $surname
-	 *
-	 * @return string
-	 */
-	private function getSurnameIndis(Tree $tree, $alpha, $surname) {
-		$indis = QueryName::individuals($tree, $surname, $alpha, '', true, false);
-		$out   = '<ul>';
-		foreach ($indis as $person) {
-			if ($person->canShowName()) {
-				$out .= '<li><a href="' . $person->getHtmlUrl() . '">' . $person->getSexImage() . ' ' . $person->getFullName() . ' ';
-				if ($person->canShow()) {
-					$bd = $person->getLifeSpan();
-					if (!empty($bd)) {
-						$out .= ' (' . $bd . ')';
-					}
-				}
-				$out .= '</a></li>';
-			}
-		}
-		$out .= '</ul>';
+    /**
+     * Format a list of individuals.
+     *
+     * @param Tree   $tree
+     * @param string $alpha
+     * @param string $surname
+     *
+     * @return string
+     */
+    private function getSurnameIndis(Tree $tree, $alpha, $surname) {
+        $indis = QueryName::individuals($tree, $surname, $alpha, '', true, false);
+        $out   = '<ul>';
+        foreach ($indis as $person) {
+            if ($person->canShowName()) {
+                $out .= '<li><a href="' . $person->getHtmlUrl() . '">' . $person->getSexImage() . ' ' . $person->getFullName() . ' ';
+                if ($person->canShow()) {
+                    $bd = $person->getLifeSpan();
+                    if (!empty($bd)) {
+                        $out .= ' (' . $bd . ')';
+                    }
+                }
+                $out .= '</a></li>';
+            }
+        }
+        $out .= '</ul>';
 
-		return $out;
-	}
+        return $out;
+    }
 
-	/**
-	 * Search for individuals in a tree.
-	 *
-	 * @param Tree   $tree  Search this tree
-	 * @param string $query Search for this text
-	 *
-	 * @return string
-	 */
-	private function search(Tree $tree, $query) {
-		if (strlen($query) < 2) {
-			return '';
-		}
-		$rows = Database::prepare(
-			"SELECT i_id AS xref, i_gedcom AS gedcom" .
-			" FROM `##individuals`, `##name`" .
-			" WHERE (i_id LIKE CONCAT('%', :query_1, '%') OR n_sort LIKE CONCAT('%', :query_2, '%'))" .
-			" AND i_id = n_id AND i_file = n_file AND i_file = :tree_id" .
-			" ORDER BY n_sort COLLATE :collation" .
-			" LIMIT 50"
-		)->execute(array(
-			'query_1'   => $query,
-			'query_2'   => $query,
-			'tree_id'   => $tree->getTreeId(),
-			'collation' => I18N::collation(),
-		))->fetchAll();
+    /**
+     * Search for individuals in a tree.
+     *
+     * @param Tree   $tree  Search this tree
+     * @param string $query Search for this text
+     *
+     * @return string
+     */
+    private function search(Tree $tree, $query) {
+        if (strlen($query) < 2) {
+            return '';
+        }
+        $rows = Database::prepare(
+            "SELECT i_id AS xref, i_gedcom AS gedcom" .
+            " FROM `##individuals`, `##name`" .
+            " WHERE (i_id LIKE CONCAT('%', :query_1, '%') OR n_sort LIKE CONCAT('%', :query_2, '%'))" .
+            " AND i_id = n_id AND i_file = n_file AND i_file = :tree_id" .
+            " ORDER BY n_sort COLLATE :collation" .
+            " LIMIT 50"
+        )->execute(array(
+            'query_1'   => $query,
+            'query_2'   => $query,
+            'tree_id'   => $tree->getTreeId(),
+            'collation' => I18N::collation(),
+        ))->fetchAll();
 
-		$out = '<ul>';
-		foreach ($rows as $row) {
-			$person = Individual::getInstance($row->xref, $tree, $row->gedcom);
-			if ($person->canShowName()) {
-				$out .= '<li><a href="' . $person->getHtmlUrl() . '">' . $person->getSexImage() . ' ' . $person->getFullName() . ' ';
-				if ($person->canShow()) {
-					$bd = $person->getLifeSpan();
-					if (!empty($bd)) {
-						$out .= ' (' . $bd . ')';
-					}
-				}
-				$out .= '</a></li>';
-			}
-		}
-		$out .= '</ul>';
+        $out = '<ul>';
+        foreach ($rows as $row) {
+            $person = Individual::getInstance($row->xref, $tree, $row->gedcom);
+            if ($person->canShowName()) {
+                $out .= '<li><a href="' . $person->getHtmlUrl() . '">' . $person->getSexImage() . ' ' . $person->getFullName() . ' ';
+                if ($person->canShow()) {
+                    $bd = $person->getLifeSpan();
+                    if (!empty($bd)) {
+                        $out .= ' (' . $bd . ')';
+                    }
+                }
+                $out .= '</a></li>';
+            }
+        }
+        $out .= '</ul>';
 
-		return $out;
-	}
+        return $out;
+    }
 }

Switch Indentation +19 added lines, -19 removed lines

@@ -46,13 +46,13 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'ajax':
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $this->getSidebarAjaxContent();
-			break;
-		default:
-			http_response_code(404);
-			break;
+		    case 'ajax':
+			    header('Content-Type: text/html; charset=UTF-8');
+			    echo $this->getSidebarAjaxContent();
+			    break;
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 
@@ -150,18 +150,18 @@ 
 		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="' . I18N::translate('Search') . '"><p>';
 		foreach ($initials as $letter => $count) {
 			switch ($letter) {
-			case '@':
-				$html = I18N::translateContext('Unknown surname', '…');
-				break;
-			case ',':
-				$html = I18N::translate('None');
-				break;
-			case ' ':
-				$html = '&nbsp;';
-				break;
-			default:
-				$html = $letter;
-				break;
+			    case '@':
+				    $html = I18N::translateContext('Unknown surname', '…');
+				    break;
+			    case ',':
+				    $html = I18N::translate('None');
+				    break;
+			    case ' ':
+				    $html = '&nbsp;';
+				    break;
+			    default:
+				    $html = $letter;
+				    break;
 			}
 			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_indi_letter">' . $html . '</a>';
 			$out .= $html . " ";

Braces +22 added lines, -11 removed lines

@@ -27,14 +27,17 @@ 
 /**
  * Class IndividualSidebarModule
  */
-class IndividualSidebarModule extends AbstractModule implements ModuleSidebarInterface {
+class IndividualSidebarModule extends AbstractModule implements ModuleSidebarInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Individual list');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of “Individuals” module */ I18N::translate('A sidebar showing an alphabetic list of all the individuals in the family tree.');
 	}
 
@@ -44,7 +47,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'ajax':
 			header('Content-Type: text/html; charset=UTF-8');
@@ -57,17 +61,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
+	public function defaultSidebarOrder()
+	{
 		return 40;
 	}
 
 	/** {@inheritdoc} */
-	public function hasSidebarContent() {
+	public function hasSidebarContent()
+	{
 		return !Auth::isSearchEngine();
 	}
 
 	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
+	public function getSidebarAjaxContent()
+	{
 		global $WT_TREE;
 
 		$alpha   = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
@@ -90,7 +97,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSidebarContent() {
+	public function getSidebarContent()
+	{
 		global $controller, $WT_TREE;
 
 		// Fetch a list of the initial letters of all surnames in the database
@@ -182,7 +190,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getAlphaSurnames(Tree $tree, $alpha) {
+	private function getAlphaSurnames(Tree $tree, $alpha)
+	{
 		$surnames = QueryName::surnames($tree, '', $alpha, true, false);
 		$out      = '<ul>';
 		foreach (array_keys($surnames) as $surname) {
@@ -204,7 +213,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getSurnameIndis(Tree $tree, $alpha, $surname) {
+	private function getSurnameIndis(Tree $tree, $alpha, $surname)
+	{
 		$indis = QueryName::individuals($tree, $surname, $alpha, '', true, false);
 		$out   = '<ul>';
 		foreach ($indis as $person) {
@@ -232,7 +242,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function search(Tree $tree, $query) {
+	private function search(Tree $tree, $query)
+	{
 		if (strlen($query) < 2) {
 			return '';
 		}

app/Module/PedigreeReportModule.php

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
  * Class PedigreeReportModule
  */
 class PedigreeReportModule 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('Pedigree');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a report */ I18N::translate('Pedigree');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Pedigree” module */ I18N::translate('A report of an individual’s ancestors, formatted as a tree.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Description of the “Pedigree” module */ I18N::translate('A report of an individual’s ancestors, formatted as a tree.');
+    }
 
-	/**
-	 * 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 PedigreeReportModule
  */
-class PedigreeReportModule extends AbstractModule implements ModuleReportInterface {
+class PedigreeReportModule 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('Pedigree');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Pedigree” module */ I18N::translate('A report of an individual’s ancestors, formatted as a tree.');
 	}
@@ -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/FrequentlyAskedQuestionsModule.php

Indentation +401 added lines, -401 removed lines

@@ -29,134 +29,134 @@ 
  * Class FrequentlyAskedQuestionsModule
  */
 class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMenuInterface, ModuleConfigInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module. Abbreviation for “Frequently Asked Questions” */ I18N::translate('FAQ');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “FAQ” module */ I18N::translate('A list of frequently asked questions and answers.');
-	}
-
-	/**
-	 * 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 'admin_config':
-			$this->config();
-			break;
-		case 'admin_delete':
-			if (Auth::isAdmin()) {
-				$this->delete();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_edit':
-			$this->edit();
-			break;
-		case 'admin_edit_save':
-			if (Auth::isAdmin()) {
-				$this->editSave();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_movedown':
-			if (Auth::isAdmin()) {
-				$this->movedown();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_moveup':
-			if (Auth::isAdmin()) {
-				$this->moveup();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'show':
-			$this->show();
-			break;
-		default:
-			http_response_code(404);
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getConfigLink() {
-		return 'module.php?mod=' . $this->getName() . '&mod_action=admin_config';
-	}
-
-	/**
-	 * Action from the configuration page
-	 */
-	private function editSave() {
-		if (Filter::checkCsrf()) {
-			$block_id = Filter::postInteger('block_id');
-			if ($block_id) {
-				Database::prepare(
-					"UPDATE `##block` SET gedcom_id = NULLIF(:tree_id, '0'), block_order = :block_order WHERE block_id = :block_id"
-				)->execute(array(
-					'tree_id'     => Filter::postInteger('gedcom_id'),
-					'block_order' => Filter::postInteger('block_order'),
-					'block_id'    => $block_id,
-				));
-			} else {
-				Database::prepare(
-					"INSERT INTO `##block` (gedcom_id, module_name, block_order) VALUES (NULLIF(:tree_id, '0'), :module_name, :block_order)"
-				)->execute(array(
-					'tree_id'     => Filter::postInteger('gedcom_id'),
-					'module_name' => $this->getName(),
-					'block_order' => Filter::postInteger('block_order'),
-				));
-				$block_id = Database::getInstance()->lastInsertId();
-			}
-			$this->setBlockSetting($block_id, 'header', Filter::post('header'));
-			$this->setBlockSetting($block_id, 'faqbody', Filter::post('faqbody'));
-
-			$languages = Filter::postArray('lang');
-			$this->setBlockSetting($block_id, 'languages', implode(',', $languages));
-		}
-	}
-
-	/**
-	 * Action from the configuration page
-	 */
-	private function edit() {
-		global $WT_TREE;
-
-		$controller = new PageController;
-		$controller->restrictAccess(Auth::isAdmin());
-
-			$block_id = Filter::getInteger('block_id');
-		if ($block_id) {
-			$controller->setPageTitle(/* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('Edit the FAQ'));
-			$header      = $this->getBlockSetting($block_id, 'header');
-			$faqbody     = $this->getBlockSetting($block_id, 'faqbody');
-			$block_order = Database::prepare(
-				"SELECT block_order FROM `##block` WHERE block_id = :block_id"
-			)->execute(array('block_id' => $block_id))->fetchOne();
-			$gedcom_id   = Database::prepare(
-				"SELECT gedcom_id FROM `##block` WHERE block_id = :block_id"
-			)->execute(array('block_id' => $block_id))->fetchOne();
-		} else {
-			$controller->setPageTitle(/* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('Add an FAQ'));
-			$header      = '';
-			$faqbody     = '';
-			$block_order = Database::prepare(
-				"SELECT IFNULL(MAX(block_order)+1, 0) FROM `##block` WHERE module_name = :module_name"
-			)->execute(array('module_name' => $this->getName()))->fetchOne();
-			$gedcom_id   = $WT_TREE->getTreeId();
-		}
-		$controller->pageHeader();
-		if (Module::getModuleByName('ckeditor')) {
-			CkeditorModule::enableEditor($controller);
-		}
-
-		?>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module. Abbreviation for “Frequently Asked Questions” */ I18N::translate('FAQ');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “FAQ” module */ I18N::translate('A list of frequently asked questions and answers.');
+    }
+
+    /**
+     * 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 'admin_config':
+            $this->config();
+            break;
+        case 'admin_delete':
+            if (Auth::isAdmin()) {
+                $this->delete();
+            }
+            header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+            break;
+        case 'admin_edit':
+            $this->edit();
+            break;
+        case 'admin_edit_save':
+            if (Auth::isAdmin()) {
+                $this->editSave();
+            }
+            header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+            break;
+        case 'admin_movedown':
+            if (Auth::isAdmin()) {
+                $this->movedown();
+            }
+            header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+            break;
+        case 'admin_moveup':
+            if (Auth::isAdmin()) {
+                $this->moveup();
+            }
+            header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+            break;
+        case 'show':
+            $this->show();
+            break;
+        default:
+            http_response_code(404);
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getConfigLink() {
+        return 'module.php?mod=' . $this->getName() . '&mod_action=admin_config';
+    }
+
+    /**
+     * Action from the configuration page
+     */
+    private function editSave() {
+        if (Filter::checkCsrf()) {
+            $block_id = Filter::postInteger('block_id');
+            if ($block_id) {
+                Database::prepare(
+                    "UPDATE `##block` SET gedcom_id = NULLIF(:tree_id, '0'), block_order = :block_order WHERE block_id = :block_id"
+                )->execute(array(
+                    'tree_id'     => Filter::postInteger('gedcom_id'),
+                    'block_order' => Filter::postInteger('block_order'),
+                    'block_id'    => $block_id,
+                ));
+            } else {
+                Database::prepare(
+                    "INSERT INTO `##block` (gedcom_id, module_name, block_order) VALUES (NULLIF(:tree_id, '0'), :module_name, :block_order)"
+                )->execute(array(
+                    'tree_id'     => Filter::postInteger('gedcom_id'),
+                    'module_name' => $this->getName(),
+                    'block_order' => Filter::postInteger('block_order'),
+                ));
+                $block_id = Database::getInstance()->lastInsertId();
+            }
+            $this->setBlockSetting($block_id, 'header', Filter::post('header'));
+            $this->setBlockSetting($block_id, 'faqbody', Filter::post('faqbody'));
+
+            $languages = Filter::postArray('lang');
+            $this->setBlockSetting($block_id, 'languages', implode(',', $languages));
+        }
+    }
+
+    /**
+     * Action from the configuration page
+     */
+    private function edit() {
+        global $WT_TREE;
+
+        $controller = new PageController;
+        $controller->restrictAccess(Auth::isAdmin());
+
+            $block_id = Filter::getInteger('block_id');
+        if ($block_id) {
+            $controller->setPageTitle(/* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('Edit the FAQ'));
+            $header      = $this->getBlockSetting($block_id, 'header');
+            $faqbody     = $this->getBlockSetting($block_id, 'faqbody');
+            $block_order = Database::prepare(
+                "SELECT block_order FROM `##block` WHERE block_id = :block_id"
+            )->execute(array('block_id' => $block_id))->fetchOne();
+            $gedcom_id   = Database::prepare(
+                "SELECT gedcom_id FROM `##block` WHERE block_id = :block_id"
+            )->execute(array('block_id' => $block_id))->fetchOne();
+        } else {
+            $controller->setPageTitle(/* I18N: FAQ = “Frequently Asked Question” */ I18N::translate('Add an FAQ'));
+            $header      = '';
+            $faqbody     = '';
+            $block_order = Database::prepare(
+                "SELECT IFNULL(MAX(block_order)+1, 0) FROM `##block` WHERE module_name = :module_name"
+            )->execute(array('module_name' => $this->getName()))->fetchOne();
+            $gedcom_id   = $WT_TREE->getTreeId();
+        }
+        $controller->pageHeader();
+        if (Module::getModuleByName('ckeditor')) {
+            CkeditorModule::enableEditor($controller);
+        }
+
+        ?>
 		<ol class="breadcrumb small">
 			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -236,204 +236,204 @@ 
 
 	</form>
 	<?php
-	}
-
-	/**
-	 * Delete an FAQ.
-	 */
-	private function delete() {
-		$block_id = Filter::getInteger('block_id');
-
-		Database::prepare(
-			"DELETE FROM `##block_setting` WHERE block_id = :block_id"
-		)->execute(array('block_id' => $block_id));
-
-		Database::prepare(
-			"DELETE FROM `##block` WHERE block_id = :block_id"
-		)->execute(array('block_id' => $block_id));
-	}
-
-	/**
-	 * Move an FAQ up the list.
-	 */
-	private function moveup() {
-		$block_id = Filter::getInteger('block_id');
-
-		$block_order = Database::prepare(
-			"SELECT block_order FROM `##block` WHERE block_id = :block_id"
-		)->execute(array('block_id' => $block_id))->fetchOne();
-
-		$swap_block = Database::prepare(
-			"SELECT block_order, block_id" .
-			" FROM `##block`" .
-			" WHERE block_order = (" .
-			"  SELECT MAX(block_order) FROM `##block` WHERE block_order < :block_order AND module_name = :module_name_1" .
-			" ) AND module_name = :module_name_2" .
-			" LIMIT 1"
-		)->execute(array(
-			'block_order'   => $block_order,
-			'module_name_1' => $this->getName(),
-			'module_name_2' => $this->getName(),
-		))->fetchOneRow();
-		if ($swap_block) {
-			Database::prepare(
-				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
-			)->execute(array(
-				'block_order' => $swap_block->block_order,
-				'block_id'    => $block_id,
-			));
-			Database::prepare(
-				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
-			)->execute(array(
-				'block_order' => $block_order,
-				'block_id'    => $swap_block->block_id,
-			));
-		}
-	}
-
-	/**
-	 * Move an FAQ down the list.
-	 */
-	private function movedown() {
-		$block_id = Filter::get('block_id');
-
-		$block_order = Database::prepare(
-			"SELECT block_order FROM `##block` WHERE block_id = :block_id"
-		)->execute(array(
-			'block_id' => $block_id,
-		))->fetchOne();
-
-		$swap_block = Database::prepare(
-			"SELECT block_order, block_id" .
-			" FROM `##block`" .
-			" WHERE block_order=(" .
-			"  SELECT MIN(block_order) FROM `##block` WHERE block_order > :block_order AND module_name = :module_name_1" .
-			" ) AND module_name = :module_name_2" .
-			" LIMIT 1"
-		)->execute(array(
-			'block_order'   => $block_order,
-			'module_name_1' => $this->getName(),
-			'module_name_2' => $this->getName(),
-			))->fetchOneRow();
-		if ($swap_block) {
-			Database::prepare(
-				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
-			)->execute(array(
-				'block_order' => $swap_block->block_order,
-				'block_id'    => $block_id,
-			));
-			Database::prepare(
-				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
-			)->execute(array(
-				'block_order' => $block_order,
-				'block_id'    => $swap_block->block_id,
-			));
-		}
-	}
-
-	/**
-	 * Show a list of FAQs
-	 */
-	private function show() {
-		global $controller, $WT_TREE;
-
-		$controller = new PageController;
-		$controller
-			->setPageTitle(I18N::translate('Frequently asked questions'))
-			->pageHeader();
-
-		$faqs = Database::prepare(
-			"SELECT block_id, bs1.setting_value AS header, bs2.setting_value AS body, bs3.setting_value AS languages" .
-			" FROM `##block` b" .
-			" JOIN `##block_setting` bs1 USING (block_id)" .
-			" JOIN `##block_setting` bs2 USING (block_id)" .
-			" JOIN `##block_setting` bs3 USING (block_id)" .
-			" WHERE module_name = :module_name" .
-			" AND bs1.setting_name = 'header'" .
-			" AND bs2.setting_name = 'faqbody'" .
-			" AND bs3.setting_name = 'languages'" .
-			" AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
-			" ORDER BY block_order"
-		)->execute(array(
-			'module_name' => $this->getName(),
-			'tree_id_1'   => $WT_TREE->getTreeId(),
-			'tree_id_2'   => $WT_TREE->getTreeId(),
-		))->fetchAll();
-
-		echo '<h2 class="center">', I18N::translate('Frequently asked questions');
-		if (Auth::isManager($WT_TREE)) {
-			echo ' — <a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_config">', I18N::translate('edit'), '</a>';
-		}
-		echo '</h2>';
-		$row_count = 0;
-		echo '<table class="faq">';
-		// List of titles
-		foreach ($faqs as $id => $faq) {
-			if (!$faq->languages || in_array(WT_LOCALE, explode(',', $faq->languages))) {
-				$row_color = ($row_count % 2) ? 'odd' : 'even';
-				// NOTE: Print the header of the current item
-				echo '<tr class="', $row_color, '"><td style="padding: 5px;">';
-				echo '<a href="#faq', $id, '">', $faq->header, '</a>';
-				echo '</td></tr>';
-				$row_count++;
-			}
-		}
-		echo '</table><hr>';
-		// Detailed entries
-		foreach ($faqs as $id => $faq) {
-			if (!$faq->languages || in_array(WT_LOCALE, explode(',', $faq->languages))) {
-				echo '<div class="faq_title" id="faq', $id, '">', $faq->header;
-				echo '<div class="faq_top faq_italic">';
-				echo '<a href="#content">', I18N::translate('back to top'), '</a>';
-				echo '</div>';
-				echo '</div>';
-				echo '<div class="faq_body">', substr($faq->body, 0, 1) == '<' ? $faq->body : nl2br($faq->body, false), '</div>';
-				echo '<hr>';
-			}
-		}
-	}
-
-	/**
-	 * Provide a form to manage the FAQs.
-	 */
-	private function config() {
-		global $WT_TREE;
-
-		$controller = new PageController;
-		$controller
-			->restrictAccess(Auth::isAdmin())
-			->setPageTitle(I18N::translate('Frequently asked questions'))
-			->pageHeader();
-
-		$faqs = Database::prepare(
-			"SELECT block_id, block_order, gedcom_id, bs1.setting_value AS header, bs2.setting_value AS faqbody" .
-			" FROM `##block` b" .
-			" JOIN `##block_setting` bs1 USING (block_id)" .
-			" JOIN `##block_setting` bs2 USING (block_id)" .
-			" WHERE module_name = :module_name" .
-			" AND bs1.setting_name = 'header'" .
-			" AND bs2.setting_name = 'faqbody'" .
-			" AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
-			" ORDER BY block_order"
-		)->execute(array(
-			'module_name' => $this->getName(),
-			'tree_id_1'   => $WT_TREE->getTreeId(),
-			'tree_id_2'   => $WT_TREE->getTreeId(),
-			))->fetchAll();
-
-		$min_block_order = Database::prepare(
-			"SELECT MIN(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)"
-		)->execute(array(
-			'tree_id' => $WT_TREE->getTreeId(),
-		))->fetchOne();
-
-		$max_block_order = Database::prepare(
-			"SELECT MAX(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)"
-		)->execute(array(
-			'tree_id' => $WT_TREE->getTreeId(),
-		))->fetchOne();
-
-		?>
+    }
+
+    /**
+     * Delete an FAQ.
+     */
+    private function delete() {
+        $block_id = Filter::getInteger('block_id');
+
+        Database::prepare(
+            "DELETE FROM `##block_setting` WHERE block_id = :block_id"
+        )->execute(array('block_id' => $block_id));
+
+        Database::prepare(
+            "DELETE FROM `##block` WHERE block_id = :block_id"
+        )->execute(array('block_id' => $block_id));
+    }
+
+    /**
+     * Move an FAQ up the list.
+     */
+    private function moveup() {
+        $block_id = Filter::getInteger('block_id');
+
+        $block_order = Database::prepare(
+            "SELECT block_order FROM `##block` WHERE block_id = :block_id"
+        )->execute(array('block_id' => $block_id))->fetchOne();
+
+        $swap_block = Database::prepare(
+            "SELECT block_order, block_id" .
+            " FROM `##block`" .
+            " WHERE block_order = (" .
+            "  SELECT MAX(block_order) FROM `##block` WHERE block_order < :block_order AND module_name = :module_name_1" .
+            " ) AND module_name = :module_name_2" .
+            " LIMIT 1"
+        )->execute(array(
+            'block_order'   => $block_order,
+            'module_name_1' => $this->getName(),
+            'module_name_2' => $this->getName(),
+        ))->fetchOneRow();
+        if ($swap_block) {
+            Database::prepare(
+                "UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+            )->execute(array(
+                'block_order' => $swap_block->block_order,
+                'block_id'    => $block_id,
+            ));
+            Database::prepare(
+                "UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+            )->execute(array(
+                'block_order' => $block_order,
+                'block_id'    => $swap_block->block_id,
+            ));
+        }
+    }
+
+    /**
+     * Move an FAQ down the list.
+     */
+    private function movedown() {
+        $block_id = Filter::get('block_id');
+
+        $block_order = Database::prepare(
+            "SELECT block_order FROM `##block` WHERE block_id = :block_id"
+        )->execute(array(
+            'block_id' => $block_id,
+        ))->fetchOne();
+
+        $swap_block = Database::prepare(
+            "SELECT block_order, block_id" .
+            " FROM `##block`" .
+            " WHERE block_order=(" .
+            "  SELECT MIN(block_order) FROM `##block` WHERE block_order > :block_order AND module_name = :module_name_1" .
+            " ) AND module_name = :module_name_2" .
+            " LIMIT 1"
+        )->execute(array(
+            'block_order'   => $block_order,
+            'module_name_1' => $this->getName(),
+            'module_name_2' => $this->getName(),
+            ))->fetchOneRow();
+        if ($swap_block) {
+            Database::prepare(
+                "UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+            )->execute(array(
+                'block_order' => $swap_block->block_order,
+                'block_id'    => $block_id,
+            ));
+            Database::prepare(
+                "UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+            )->execute(array(
+                'block_order' => $block_order,
+                'block_id'    => $swap_block->block_id,
+            ));
+        }
+    }
+
+    /**
+     * Show a list of FAQs
+     */
+    private function show() {
+        global $controller, $WT_TREE;
+
+        $controller = new PageController;
+        $controller
+            ->setPageTitle(I18N::translate('Frequently asked questions'))
+            ->pageHeader();
+
+        $faqs = Database::prepare(
+            "SELECT block_id, bs1.setting_value AS header, bs2.setting_value AS body, bs3.setting_value AS languages" .
+            " FROM `##block` b" .
+            " JOIN `##block_setting` bs1 USING (block_id)" .
+            " JOIN `##block_setting` bs2 USING (block_id)" .
+            " JOIN `##block_setting` bs3 USING (block_id)" .
+            " WHERE module_name = :module_name" .
+            " AND bs1.setting_name = 'header'" .
+            " AND bs2.setting_name = 'faqbody'" .
+            " AND bs3.setting_name = 'languages'" .
+            " AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
+            " ORDER BY block_order"
+        )->execute(array(
+            'module_name' => $this->getName(),
+            'tree_id_1'   => $WT_TREE->getTreeId(),
+            'tree_id_2'   => $WT_TREE->getTreeId(),
+        ))->fetchAll();
+
+        echo '<h2 class="center">', I18N::translate('Frequently asked questions');
+        if (Auth::isManager($WT_TREE)) {
+            echo ' — <a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_config">', I18N::translate('edit'), '</a>';
+        }
+        echo '</h2>';
+        $row_count = 0;
+        echo '<table class="faq">';
+        // List of titles
+        foreach ($faqs as $id => $faq) {
+            if (!$faq->languages || in_array(WT_LOCALE, explode(',', $faq->languages))) {
+                $row_color = ($row_count % 2) ? 'odd' : 'even';
+                // NOTE: Print the header of the current item
+                echo '<tr class="', $row_color, '"><td style="padding: 5px;">';
+                echo '<a href="#faq', $id, '">', $faq->header, '</a>';
+                echo '</td></tr>';
+                $row_count++;
+            }
+        }
+        echo '</table><hr>';
+        // Detailed entries
+        foreach ($faqs as $id => $faq) {
+            if (!$faq->languages || in_array(WT_LOCALE, explode(',', $faq->languages))) {
+                echo '<div class="faq_title" id="faq', $id, '">', $faq->header;
+                echo '<div class="faq_top faq_italic">';
+                echo '<a href="#content">', I18N::translate('back to top'), '</a>';
+                echo '</div>';
+                echo '</div>';
+                echo '<div class="faq_body">', substr($faq->body, 0, 1) == '<' ? $faq->body : nl2br($faq->body, false), '</div>';
+                echo '<hr>';
+            }
+        }
+    }
+
+    /**
+     * Provide a form to manage the FAQs.
+     */
+    private function config() {
+        global $WT_TREE;
+
+        $controller = new PageController;
+        $controller
+            ->restrictAccess(Auth::isAdmin())
+            ->setPageTitle(I18N::translate('Frequently asked questions'))
+            ->pageHeader();
+
+        $faqs = Database::prepare(
+            "SELECT block_id, block_order, gedcom_id, bs1.setting_value AS header, bs2.setting_value AS faqbody" .
+            " FROM `##block` b" .
+            " JOIN `##block_setting` bs1 USING (block_id)" .
+            " JOIN `##block_setting` bs2 USING (block_id)" .
+            " WHERE module_name = :module_name" .
+            " AND bs1.setting_name = 'header'" .
+            " AND bs2.setting_name = 'faqbody'" .
+            " AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
+            " ORDER BY block_order"
+        )->execute(array(
+            'module_name' => $this->getName(),
+            'tree_id_1'   => $WT_TREE->getTreeId(),
+            'tree_id_2'   => $WT_TREE->getTreeId(),
+            ))->fetchAll();
+
+        $min_block_order = Database::prepare(
+            "SELECT MIN(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)"
+        )->execute(array(
+            'tree_id' => $WT_TREE->getTreeId(),
+        ))->fetchOne();
+
+        $max_block_order = Database::prepare(
+            "SELECT MAX(block_order) FROM `##block` WHERE module_name = 'faq' AND (gedcom_id = :tree_id OR gedcom_id IS NULL)"
+        )->execute(array(
+            'tree_id' => $WT_TREE->getTreeId(),
+        ))->fetchOne();
+
+        ?>
 		<ol class="breadcrumb small">
 			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -465,79 +465,79 @@ 
 		</p>
 
 		<?php
-		echo '<table class="table table-bordered">';
-		foreach ($faqs as $faq) {
-			// NOTE: Print the position of the current item
-			echo '<tr class="faq_edit_pos"><td>';
-			echo I18N::translate('#%s', $faq->block_order + 1), ' ';
-			if ($faq->gedcom_id === null) {
-				echo I18N::translate('All');
-			} else {
-				echo $WT_TREE->getTitleHtml();
-			}
-			echo '</td>';
-			// NOTE: Print the edit options of the current item
-			echo '<td>';
-			if ($faq->block_order == $min_block_order) {
-				echo '&nbsp;';
-			} else {
-				echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_moveup&amp;block_id=', $faq->block_id, '"><i class="fa fa-arrow-up"></i></i> ', I18N::translate('Move up'), '</a>';
-			}
-			echo '</td><td>';
-			if ($faq->block_order == $max_block_order) {
-				echo '&nbsp;';
-			} else {
-				echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_movedown&amp;block_id=', $faq->block_id, '"><i class="fa fa-arrow-down"></i></i> ', I18N::translate('Move down'), '</a>';
-			}
-			echo '</td><td>';
-			echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_edit&amp;block_id=', $faq->block_id, '"><i class="fa fa-pencil"></i> ', I18N::translate('Edit'), '</a>';
-			echo '</td><td>';
-			echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_delete&amp;block_id=', $faq->block_id, '" onclick="return confirm(\'', I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeHtml($faq->header)), '\');"><i class="fa fa-trash"></i> ', I18N::translate('Delete'), '</a>';
-			echo '</td></tr>';
-			// NOTE: Print the title text of the current item
-			echo '<tr><td colspan="5">';
-			echo '<div class="faq_edit_item">';
-			echo '<div class="faq_edit_title">', $faq->header, '</div>';
-			// NOTE: Print the body text of the current item
-			echo '<div class="faq_edit_content">', substr($faq->faqbody, 0, 1) == '<' ? $faq->faqbody : nl2br($faq->faqbody, false), '</div></div></td></tr>';
-		}
-		echo '</table>';
-	}
-
-	/**
-	 * The user can re-order menus. Until they do, they are shown in this order.
-	 *
-	 * @return int
-	 */
-	public function defaultMenuOrder() {
-		return 40;
-	}
-
-	/**
-	 * A menu, to be added to the main application menu.
-	 *
-	 * @return Menu|null
-	 */
-	public function getMenu() {
-		global $WT_TREE;
-
-		$faqs = Database::prepare(
-			"SELECT block_id FROM `##block`" .
-			" JOIN `##block_setting` USING (block_id)" .
-			" WHERE module_name = :module_name AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
-			" AND setting_name='languages' AND (setting_value LIKE CONCAT('%', :locale, '%') OR setting_value='')"
-		)->execute(array(
-			'module_name' => $this->getName(),
-			'tree_id_1'   => $WT_TREE->getTreeId(),
-			'tree_id_2'   => $WT_TREE->getTreeId(),
-			'locale'      => WT_LOCALE,
-		))->fetchAll();
-
-		if ($faqs) {
-			return new Menu($this->getTitle(), 'module.php?mod=faq&amp;mod_action=show', 'menu-help');
-		} else {
-			return null;
-		}
-
-	}
+        echo '<table class="table table-bordered">';
+        foreach ($faqs as $faq) {
+            // NOTE: Print the position of the current item
+            echo '<tr class="faq_edit_pos"><td>';
+            echo I18N::translate('#%s', $faq->block_order + 1), ' ';
+            if ($faq->gedcom_id === null) {
+                echo I18N::translate('All');
+            } else {
+                echo $WT_TREE->getTitleHtml();
+            }
+            echo '</td>';
+            // NOTE: Print the edit options of the current item
+            echo '<td>';
+            if ($faq->block_order == $min_block_order) {
+                echo '&nbsp;';
+            } else {
+                echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_moveup&amp;block_id=', $faq->block_id, '"><i class="fa fa-arrow-up"></i></i> ', I18N::translate('Move up'), '</a>';
+            }
+            echo '</td><td>';
+            if ($faq->block_order == $max_block_order) {
+                echo '&nbsp;';
+            } else {
+                echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_movedown&amp;block_id=', $faq->block_id, '"><i class="fa fa-arrow-down"></i></i> ', I18N::translate('Move down'), '</a>';
+            }
+            echo '</td><td>';
+            echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_edit&amp;block_id=', $faq->block_id, '"><i class="fa fa-pencil"></i> ', I18N::translate('Edit'), '</a>';
+            echo '</td><td>';
+            echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_delete&amp;block_id=', $faq->block_id, '" onclick="return confirm(\'', I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeHtml($faq->header)), '\');"><i class="fa fa-trash"></i> ', I18N::translate('Delete'), '</a>';
+            echo '</td></tr>';
+            // NOTE: Print the title text of the current item
+            echo '<tr><td colspan="5">';
+            echo '<div class="faq_edit_item">';
+            echo '<div class="faq_edit_title">', $faq->header, '</div>';
+            // NOTE: Print the body text of the current item
+            echo '<div class="faq_edit_content">', substr($faq->faqbody, 0, 1) == '<' ? $faq->faqbody : nl2br($faq->faqbody, false), '</div></div></td></tr>';
+        }
+        echo '</table>';
+    }
+
+    /**
+     * The user can re-order menus. Until they do, they are shown in this order.
+     *
+     * @return int
+     */
+    public function defaultMenuOrder() {
+        return 40;
+    }
+
+    /**
+     * A menu, to be added to the main application menu.
+     *
+     * @return Menu|null
+     */
+    public function getMenu() {
+        global $WT_TREE;
+
+        $faqs = Database::prepare(
+            "SELECT block_id FROM `##block`" .
+            " JOIN `##block_setting` USING (block_id)" .
+            " WHERE module_name = :module_name AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
+            " AND setting_name='languages' AND (setting_value LIKE CONCAT('%', :locale, '%') OR setting_value='')"
+        )->execute(array(
+            'module_name' => $this->getName(),
+            'tree_id_1'   => $WT_TREE->getTreeId(),
+            'tree_id_2'   => $WT_TREE->getTreeId(),
+            'locale'      => WT_LOCALE,
+        ))->fetchAll();
+
+        if ($faqs) {
+            return new Menu($this->getTitle(), 'module.php?mod=faq&amp;mod_action=show', 'menu-help');
+        } else {
+            return null;
+        }
+
+    }
 }

Switch Indentation +35 added lines, -35 removed lines

@@ -47,41 +47,41 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_config':
-			$this->config();
-			break;
-		case 'admin_delete':
-			if (Auth::isAdmin()) {
-				$this->delete();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_edit':
-			$this->edit();
-			break;
-		case 'admin_edit_save':
-			if (Auth::isAdmin()) {
-				$this->editSave();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_movedown':
-			if (Auth::isAdmin()) {
-				$this->movedown();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'admin_moveup':
-			if (Auth::isAdmin()) {
-				$this->moveup();
-			}
-			header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
-			break;
-		case 'show':
-			$this->show();
-			break;
-		default:
-			http_response_code(404);
+		    case 'admin_config':
+			    $this->config();
+			    break;
+		    case 'admin_delete':
+			    if (Auth::isAdmin()) {
+				    $this->delete();
+			    }
+			    header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+			    break;
+		    case 'admin_edit':
+			    $this->edit();
+			    break;
+		    case 'admin_edit_save':
+			    if (Auth::isAdmin()) {
+				    $this->editSave();
+			    }
+			    header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+			    break;
+		    case 'admin_movedown':
+			    if (Auth::isAdmin()) {
+				    $this->movedown();
+			    }
+			    header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+			    break;
+		    case 'admin_moveup':
+			    if (Auth::isAdmin()) {
+				    $this->moveup();
+			    }
+			    header('Location: ' . WT_BASE_URL . 'module.php?mod=faq&mod_action=admin_config');
+			    break;
+		    case 'show':
+			    $this->show();
+			    break;
+		    default:
+			    http_response_code(404);
 		}
 	}
 

Braces +26 added lines, -13 removed lines

@@ -30,12 +30,14 @@ 
  */
 class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMenuInterface, ModuleConfigInterface {
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module. Abbreviation for “Frequently Asked Questions” */ I18N::translate('FAQ');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “FAQ” module */ I18N::translate('A list of frequently asked questions and answers.');
 	}
 
@@ -45,7 +47,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'admin_config':
 			$this->config();
@@ -86,14 +89,16 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function getConfigLink() {
+	public function getConfigLink()
+	{
 		return 'module.php?mod=' . $this->getName() . '&mod_action=admin_config';
 	}
 
 	/**
 	 * Action from the configuration page
 	 */
-	private function editSave() {
+	private function editSave()
+	{
 		if (Filter::checkCsrf()) {
 			$block_id = Filter::postInteger('block_id');
 			if ($block_id) {
@@ -125,7 +130,8 @@ 
 	/**
 	 * Action from the configuration page
 	 */
-	private function edit() {
+	private function edit()
+	{
 		global $WT_TREE;
 
 		$controller = new PageController;
@@ -241,7 +247,8 @@ 
 	/**
 	 * Delete an FAQ.
 	 */
-	private function delete() {
+	private function delete()
+	{
 		$block_id = Filter::getInteger('block_id');
 
 		Database::prepare(
@@ -256,7 +263,8 @@ 
 	/**
 	 * Move an FAQ up the list.
 	 */
-	private function moveup() {
+	private function moveup()
+	{
 		$block_id = Filter::getInteger('block_id');
 
 		$block_order = Database::prepare(
@@ -294,7 +302,8 @@ 
 	/**
 	 * Move an FAQ down the list.
 	 */
-	private function movedown() {
+	private function movedown()
+	{
 		$block_id = Filter::get('block_id');
 
 		$block_order = Database::prepare(
@@ -334,7 +343,8 @@ 
 	/**
 	 * Show a list of FAQs
 	 */
-	private function show() {
+	private function show()
+	{
 		global $controller, $WT_TREE;
 
 		$controller = new PageController;
@@ -396,7 +406,8 @@ 
 	/**
 	 * Provide a form to manage the FAQs.
 	 */
-	private function config() {
+	private function config()
+	{
 		global $WT_TREE;
 
 		$controller = new PageController;
@@ -509,7 +520,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultMenuOrder() {
+	public function defaultMenuOrder()
+	{
 		return 40;
 	}
 
@@ -518,7 +530,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getMenu() {
+	public function getMenu()
+	{
 		global $WT_TREE;
 
 		$faqs = Database::prepare(

app/Module/GoogleMaps/Schema/Migration2.php

Indentation +5 added lines, -5 removed lines

@@ -22,10 +22,10 @@
  * Upgrade the database schema from version 2 to version 3.
  */
 class Migration2 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Convert flag icons from .gif to .png
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Convert flag icons from .gif to .png
 
-		Database::exec("UPDATE `##placelocation` SET pl_icon=REPLACE(pl_icon, '.gif', '.png')");
-	}
+        Database::exec("UPDATE `##placelocation` SET pl_icon=REPLACE(pl_icon, '.gif', '.png')");
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,9 +21,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()
+	{
 		// Convert flag icons from .gif to .png
 
 		Database::exec("UPDATE `##placelocation` SET pl_icon=REPLACE(pl_icon, '.gif', '.png')");

app/Module/GoogleMaps/Schema/Migration1.php

Indentation +18 added lines, -18 removed lines

@@ -23,22 +23,22 @@
  * Upgrade the database schema from version 1 to version 2.
  */
 class Migration1 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Update the tables to support streetview
-		try {
-			Database::exec(
-				"ALTER TABLE `##placelocation` ADD (" .
-				" pl_media      VARCHAR(60)     NULL," .
-				" sv_long       FLOAT           NOT NULL DEFAULT 0," .
-				" sv_lati       FLOAT           NOT NULL DEFAULT 0," .
-				" sv_bearing    FLOAT           NOT NULL DEFAULT 0," .
-				" sv_elevation  FLOAT           NOT NULL DEFAULT 0," .
-				" sv_zoom       FLOAT           NOT NULL DEFAULT 1" .
-				")"
-			);
-		} catch (PDOException $ex) {
-			// Already done this?
-		}
-	}
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Update the tables to support streetview
+        try {
+            Database::exec(
+                "ALTER TABLE `##placelocation` ADD (" .
+                " pl_media      VARCHAR(60)     NULL," .
+                " sv_long       FLOAT           NOT NULL DEFAULT 0," .
+                " sv_lati       FLOAT           NOT NULL DEFAULT 0," .
+                " sv_bearing    FLOAT           NOT NULL DEFAULT 0," .
+                " sv_elevation  FLOAT           NOT NULL DEFAULT 0," .
+                " sv_zoom       FLOAT           NOT NULL DEFAULT 1" .
+                ")"
+            );
+        } catch (PDOException $ex) {
+            // Already done this?
+        }
+    }
 }

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()
+	{
 		// Update the tables to support streetview
 		try {
 			Database::exec(

app/Module/GoogleMaps/Schema/Migration5.php

Indentation +22 added lines, -22 removed lines

@@ -22,26 +22,26 @@
  * Upgrade the database schema from version 5 to version 6.
  */
 class Migration5 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Default settings
-		Database::prepare(
-			"INSERT IGNORE INTO `##module_setting` (module_name, setting_name, setting_value) VALUES " .
-			" ('googlemap', 'GM_MAP_TYPE', 'G_NORMAL_MAP')," .
-			" ('googlemap', 'GM_MAX_ZOOM', '15')," .
-			" ('googlemap', 'GM_MIN_ZOOM', '2')," .
-			" ('googlemap', 'GM_PRECISION_0', '0')," .
-			" ('googlemap', 'GM_PRECISION_1', '1')," .
-			" ('googlemap', 'GM_PRECISION_2', '2')," .
-			" ('googlemap', 'GM_PRECISION_3', '3')," .
-			" ('googlemap', 'GM_PRECISION_4', '4')," .
-			" ('googlemap', 'GM_PRECISION_5', '5')," .
-			" ('googlemap', 'GM_XSIZE', '600')," .
-			" ('googlemap', 'GM_YSIZE', '400')," .
-			" ('googlemap', 'GM_PH_XSIZE', '500')," .
-			" ('googlemap', 'GM_PH_YSIZE', '350')," .
-			" ('googlemap', 'GM_PH_MARKER', 'G_FLAG')," .
-			" ('googlemap', 'GM_DISP_SHORT_PLACE', '0')"
-		)->execute();
-	}
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Default settings
+        Database::prepare(
+            "INSERT IGNORE INTO `##module_setting` (module_name, setting_name, setting_value) VALUES " .
+            " ('googlemap', 'GM_MAP_TYPE', 'G_NORMAL_MAP')," .
+            " ('googlemap', 'GM_MAX_ZOOM', '15')," .
+            " ('googlemap', 'GM_MIN_ZOOM', '2')," .
+            " ('googlemap', 'GM_PRECISION_0', '0')," .
+            " ('googlemap', 'GM_PRECISION_1', '1')," .
+            " ('googlemap', 'GM_PRECISION_2', '2')," .
+            " ('googlemap', 'GM_PRECISION_3', '3')," .
+            " ('googlemap', 'GM_PRECISION_4', '4')," .
+            " ('googlemap', 'GM_PRECISION_5', '5')," .
+            " ('googlemap', 'GM_XSIZE', '600')," .
+            " ('googlemap', 'GM_YSIZE', '400')," .
+            " ('googlemap', 'GM_PH_XSIZE', '500')," .
+            " ('googlemap', 'GM_PH_YSIZE', '350')," .
+            " ('googlemap', 'GM_PH_MARKER', 'G_FLAG')," .
+            " ('googlemap', 'GM_DISP_SHORT_PLACE', '0')"
+        )->execute();
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,9 +21,11 @@
 /**
  * Upgrade the database schema from version 5 to version 6.
  */
-class Migration5 implements MigrationInterface {
+class Migration5 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Default settings
 		Database::prepare(
 			"INSERT IGNORE INTO `##module_setting` (module_name, setting_name, setting_value) VALUES " .

app/Module/GoogleMaps/Schema/Migration0.php

Indentation +22 added lines, -22 removed lines

@@ -22,27 +22,27 @@
  * Upgrade the database schema from version 0 (empty database) to version 1.
  */
 class Migration0 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Create the tables, as per PhpGedView 4.2.1
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Create the tables, as per PhpGedView 4.2.1
 
-		Database::exec(
-			"CREATE TABLE IF NOT EXISTS `##placelocation` (" .
-			" pl_id        INTEGER      NOT NULL," .
-			" pl_parent_id INTEGER          NULL," .
-			" pl_level     INTEGER          NULL," .
-			" pl_place     VARCHAR(255)     NULL," .
-			" pl_long      VARCHAR(30)      NULL," .
-			" pl_lati      VARCHAR(30)      NULL," .
-			" pl_zoom      INTEGER          NULL," .
-			" pl_icon      VARCHAR(255)     NULL," .
-			" PRIMARY KEY     (pl_id)," .
-			"         KEY ix1 (pl_level)," .
-			"         KEY ix2 (pl_long)," .
-			"         KEY ix3 (pl_lati)," .
-			"         KEY ix4 (pl_place)," .
-			"         KEY ix5 (pl_parent_id)" .
-			") COLLATE utf8_unicode_ci ENGINE=InnoDB"
-		);
-	}
+        Database::exec(
+            "CREATE TABLE IF NOT EXISTS `##placelocation` (" .
+            " pl_id        INTEGER      NOT NULL," .
+            " pl_parent_id INTEGER          NULL," .
+            " pl_level     INTEGER          NULL," .
+            " pl_place     VARCHAR(255)     NULL," .
+            " pl_long      VARCHAR(30)      NULL," .
+            " pl_lati      VARCHAR(30)      NULL," .
+            " pl_zoom      INTEGER          NULL," .
+            " pl_icon      VARCHAR(255)     NULL," .
+            " PRIMARY KEY     (pl_id)," .
+            "         KEY ix1 (pl_level)," .
+            "         KEY ix2 (pl_long)," .
+            "         KEY ix3 (pl_lati)," .
+            "         KEY ix4 (pl_place)," .
+            "         KEY ix5 (pl_parent_id)" .
+            ") 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()
+	{
 		// Create the tables, as per PhpGedView 4.2.1
 
 		Database::exec(

app/Module/GoogleMaps/Schema/Migration3.php

Indentation +10 added lines, -10 removed lines

@@ -22,15 +22,15 @@
  * Upgrade the database schema from version 3 to version 4.
  */
 class Migration3 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Combine the two ways of enabling the GM module
-		Database::exec(
-			"UPDATE `##module` m, `##module_setting` ms SET m.status=CASE WHEN (m.status=1 AND ms.setting_value=1) THEN 'enabled' ELSE 'disabled' END WHERE m.module_name=ms.module_name AND m.module_name='googlemap' AND ms.setting_name='GM_ENABLED'"
-		);
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Combine the two ways of enabling the GM module
+        Database::exec(
+            "UPDATE `##module` m, `##module_setting` ms SET m.status=CASE WHEN (m.status=1 AND ms.setting_value=1) THEN 'enabled' ELSE 'disabled' END WHERE m.module_name=ms.module_name AND m.module_name='googlemap' AND ms.setting_name='GM_ENABLED'"
+        );
 
-		Database::exec(
-			"DELETE FROM `##module_setting` WHERE module_name='googlemap' AND setting_name='GM_ENABLED'"
-		);
-	}
+        Database::exec(
+            "DELETE FROM `##module_setting` WHERE module_name='googlemap' AND setting_name='GM_ENABLED'"
+        );
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,9 +21,11 @@
 /**
  * Upgrade the database schema from version 3 to version 4.
  */
-class Migration3 implements MigrationInterface {
+class Migration3 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Combine the two ways of enabling the GM module
 		Database::exec(
 			"UPDATE `##module` m, `##module_setting` ms SET m.status=CASE WHEN (m.status=1 AND ms.setting_value=1) THEN 'enabled' ELSE 'disabled' END WHERE m.module_name=ms.module_name AND m.module_name='googlemap' AND ms.setting_name='GM_ENABLED'"

app/Module/GoogleMaps/Schema/Migration4.php

Indentation +7 added lines, -7 removed lines

@@ -22,12 +22,12 @@
  * Upgrade the database schema from version 4 to version 5.
  */
 class Migration4 implements MigrationInterface {
-	/** {@inheritDoc} */
-	public function upgrade() {
-		// Delete some old/unused configuration settings
-		Database::exec(
-			"DELETE FROM `##module_setting` WHERE module_name='googlemap' AND setting_name IN (
+    /** {@inheritDoc} */
+    public function upgrade() {
+        // Delete some old/unused configuration settings
+        Database::exec(
+            "DELETE FROM `##module_setting` WHERE module_name='googlemap' AND setting_name IN (
 	'GM_API_KEY', 'GM_DEFAULT_TOP_VALUE', 'GM_DISP_COUNT', 'GM_MAX_NOF_LEVELS', 'GM_PH_CONTROLS', 'GM_PH_WHEEL', 'GM_PRE_POST_MODE_1', 'GM_PRE_POST_MODE_2', 'GM_PRE_POST_MODE_3', 'GM_PRE_POST_MODE_4', 'GM_PRE_POST_MODE_5', 'GM_PRE_POST_MODE_6', 'GM_PRE_POST_MODE_7', 'GM_PRE_POST_MODE_8', 'GM_PRE_POST_MODE_9')"
-		);
-	}
+        );
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -21,9 +21,11 @@
 /**
  * Upgrade the database schema from version 4 to version 5.
  */
-class Migration4 implements MigrationInterface {
+class Migration4 implements MigrationInterface
+{
 	/** {@inheritDoc} */
-	public function upgrade() {
+	public function upgrade()
+	{
 		// Delete some old/unused configuration settings
 		Database::exec(
 			"DELETE FROM `##module_setting` WHERE module_name='googlemap' AND setting_name IN (