fisharebest / webtrees

app/Module/UserJournalModule.php

Indentation +112 added lines, -112 removed lines

@@ -26,116 +26,116 @@
  * Class UserJournalModule
  */
 class UserJournalModule extends AbstractModule implements ModuleBlockInterface {
-	/**
-	 * Create a new module.
-	 *
-	 * @param string $directory Where is this module installed
-	 */
-	public function __construct($directory) {
-		parent::__construct($directory);
-
-		// Create/update the database tables.
-		Database::updateSchema('\Fisharebest\Webtrees\Module\FamilyTreeNews\Schema', 'NB_SCHEMA_VERSION', 3);
-	}
-
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Journal');
-	}
-
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “Journal” module */ I18N::translate('A private area to record notes or keep a journal.');
-	}
-
-	/**
-	 * 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;
-
-		switch (Filter::get('action')) {
-		case 'deletenews':
-			$news_id = Filter::getInteger('news_id');
-			if ($news_id) {
-				Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
-			}
-			break;
-		}
-
-		$articles = Database::prepare(
-			"SELECT news_id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) + :offset AS updated, subject, body FROM `##news` WHERE user_id = :user_id ORDER BY updated DESC"
-		)->execute(array(
-			'offset'  => WT_TIMESTAMP_OFFSET,
-			'user_id' => Auth::id(),
-		))->fetchAll();
-
-		$id      = $this->getName() . $block_id;
-		$class   = $this->getName() . '_block';
-		$title   = $this->getTitle();
-		$content = '';
-
-		if (empty($articles)) {
-			$content .= '<p>' . I18N::translate('You have not created any journal items.') . '</p>';
-		}
-
-		foreach ($articles as $article) {
-			$content .= '<div class="journal_box">';
-			$content .= '<div class="news_title">' . Filter::escapeHtml($article->subject) . '</div>';
-			$content .= '<div class="news_date">' . FunctionsDate::formatTimestamp($article->updated) . '</div>';
-			if ($article->body == strip_tags($article->body)) {
-				$article->body = nl2br($article->body, false);
-			}
-			$content .= $article->body;
-			$content .= '<a href="#" onclick="window.open(\'editnews.php?news_id=\'+' . $article->news_id . ', \'_blank\', indx_window_specs); return false;">' . I18N::translate('Edit') . '</a>';
-			$content .= ' | ';
-			$content .= '<a href="index.php?action=deletenews&amp;news_id=' . $article->news_id . '&amp;ctype=' . $ctype . '&amp;ged=' . $WT_TREE->getNameHtml() . '" onclick="return confirm(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeHtml($article->subject)) . "');\">" . I18N::translate('Delete') . '</a><br>';
-			$content .= '</div><br>';
-		}
-
-		$content .= '<p><a href="#" onclick="window.open(\'editnews.php?user_id=' . Auth::id() . '\', \'_blank\', indx_window_specs); return false;">' . I18N::translate('Add a journal entry') . '</a></p>';
-
-		if ($template) {
-			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) {
-	}
+    /**
+     * Create a new module.
+     *
+     * @param string $directory Where is this module installed
+     */
+    public function __construct($directory) {
+        parent::__construct($directory);
+
+        // Create/update the database tables.
+        Database::updateSchema('\Fisharebest\Webtrees\Module\FamilyTreeNews\Schema', 'NB_SCHEMA_VERSION', 3);
+    }
+
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Journal');
+    }
+
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “Journal” module */ I18N::translate('A private area to record notes or keep a journal.');
+    }
+
+    /**
+     * 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;
+
+        switch (Filter::get('action')) {
+        case 'deletenews':
+            $news_id = Filter::getInteger('news_id');
+            if ($news_id) {
+                Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
+            }
+            break;
+        }
+
+        $articles = Database::prepare(
+            "SELECT news_id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) + :offset AS updated, subject, body FROM `##news` WHERE user_id = :user_id ORDER BY updated DESC"
+        )->execute(array(
+            'offset'  => WT_TIMESTAMP_OFFSET,
+            'user_id' => Auth::id(),
+        ))->fetchAll();
+
+        $id      = $this->getName() . $block_id;
+        $class   = $this->getName() . '_block';
+        $title   = $this->getTitle();
+        $content = '';
+
+        if (empty($articles)) {
+            $content .= '<p>' . I18N::translate('You have not created any journal items.') . '</p>';
+        }
+
+        foreach ($articles as $article) {
+            $content .= '<div class="journal_box">';
+            $content .= '<div class="news_title">' . Filter::escapeHtml($article->subject) . '</div>';
+            $content .= '<div class="news_date">' . FunctionsDate::formatTimestamp($article->updated) . '</div>';
+            if ($article->body == strip_tags($article->body)) {
+                $article->body = nl2br($article->body, false);
+            }
+            $content .= $article->body;
+            $content .= '<a href="#" onclick="window.open(\'editnews.php?news_id=\'+' . $article->news_id . ', \'_blank\', indx_window_specs); return false;">' . I18N::translate('Edit') . '</a>';
+            $content .= ' | ';
+            $content .= '<a href="index.php?action=deletenews&amp;news_id=' . $article->news_id . '&amp;ctype=' . $ctype . '&amp;ged=' . $WT_TREE->getNameHtml() . '" onclick="return confirm(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeHtml($article->subject)) . "');\">" . I18N::translate('Delete') . '</a><br>';
+            $content .= '</div><br>';
+        }
+
+        $content .= '<p><a href="#" onclick="window.open(\'editnews.php?user_id=' . Auth::id() . '\', \'_blank\', indx_window_specs); return false;">' . I18N::translate('Add a journal entry') . '</a></p>';
+
+        if ($template) {
+            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) {
+    }
 }

Switch Indentation +6 added lines, -6 removed lines

@@ -69,12 +69,12 @@
 		global $ctype, $WT_TREE;
 
 		switch (Filter::get('action')) {
-		case 'deletenews':
-			$news_id = Filter::getInteger('news_id');
-			if ($news_id) {
-				Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
-			}
-			break;
+		    case 'deletenews':
+			    $news_id = Filter::getInteger('news_id');
+			    if ($news_id) {
+				    Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
+			    }
+			    break;
 		}
 
 		$articles = Database::prepare(

Braces +18 added lines, -9 removed lines

@@ -25,13 +25,15 @@ 
 /**
  * Class UserJournalModule
  */
-class UserJournalModule extends AbstractModule implements ModuleBlockInterface {
+class UserJournalModule extends AbstractModule implements ModuleBlockInterface
+{
 	/**
 	 * Create a new module.
 	 *
 	 * @param string $directory Where is this module installed
 	 */
-	public function __construct($directory) {
+	public function __construct($directory)
+	{
 		parent::__construct($directory);
 
 		// Create/update the database tables.
@@ -43,7 +45,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Journal');
 	}
 
@@ -52,7 +55,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Journal” module */ I18N::translate('A private area to record notes or keep a journal.');
 	}
 
@@ -65,7 +69,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;
 
 		switch (Filter::get('action')) {
@@ -117,17 +122,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;
 	}
 
@@ -136,6 +144,7 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 	}
 }

app/Module/DeathReportModule.php

Indentation +34 added lines, -34 removed lines

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

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class DeathReportModule
  */
-class DeathReportModule extends AbstractModule implements ModuleReportInterface {
+class DeathReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report */ I18N::translate('Deaths');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Deaths” module */ I18N::translate('A report of individuals who died in a given time or place.');
 	}
@@ -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 $WT_TREE;
 
 		return new Menu(

app/Module/InteractiveTreeModule.php

Indentation +145 added lines, -145 removed lines

@@ -28,78 +28,78 @@ 
  * Tip : you could change the number of generations loaded before ajax calls both in individual page and in treeview page to optimize speed and server load
  */
 class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface, ModuleChartInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Interactive tree');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Interactive tree” module */ I18N::translate('An interactive tree, showing all the ancestors and descendants of an individual.');
-	}
-
-	/** {@inheritdoc} */
-	public function defaultTabOrder() {
-		return 68;
-	}
-
-	/** {@inheritdoc} */
-	public function getTabContent() {
-		global $controller;
-
-		$tv              = new TreeView('tvTab');
-		list($html, $js) = $tv->drawViewport($controller->record, 3);
-
-		return
-			'<script src="' . $this->js() . '"></script>' .
-			'<script src="' . WT_JQUERYUI_TOUCH_PUNCH_URL . '"></script>' .
-			'<script>' . $js . '</script>' .
-			$html;
-	}
-
-	/** {@inheritdoc} */
-	public function hasTabContent() {
-		return !Auth::isSearchEngine();
-	}
-
-	/** {@inheritdoc} */
-	public function isGrayedOut() {
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function canLoadAjax() {
-		return true;
-	}
-
-	/**
-	 * Return a menu item for this chart.
-	 *
-	 * @return Menu|null
-	 */
-	public function getChartMenu(Individual $individual) {
-		return new Menu(
-			$this->getTitle(),
-			'module.php?mod=tree&amp;mod_action=treeview&amp;rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(),
-			'menu-chart-tree',
-			array('rel' => 'nofollow')
-		);
-	}
-
-	/**
-	 * Return a menu item for this chart - for use in individual boxes.
-	 *
-	 * @return Menu|null
-	 */
-	public function getBoxChartMenu(Individual $individual) {
-		return $this->getChartMenu($individual);
-	}
-
-	/** {@inheritdoc} */
-	public function getPreLoadContent() {
-		// We cannot use jQuery("head").append(<link rel="stylesheet" ...as jQuery is not loaded at this time
-		return
-			'<script>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Interactive tree');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Interactive tree” module */ I18N::translate('An interactive tree, showing all the ancestors and descendants of an individual.');
+    }
+
+    /** {@inheritdoc} */
+    public function defaultTabOrder() {
+        return 68;
+    }
+
+    /** {@inheritdoc} */
+    public function getTabContent() {
+        global $controller;
+
+        $tv              = new TreeView('tvTab');
+        list($html, $js) = $tv->drawViewport($controller->record, 3);
+
+        return
+            '<script src="' . $this->js() . '"></script>' .
+            '<script src="' . WT_JQUERYUI_TOUCH_PUNCH_URL . '"></script>' .
+            '<script>' . $js . '</script>' .
+            $html;
+    }
+
+    /** {@inheritdoc} */
+    public function hasTabContent() {
+        return !Auth::isSearchEngine();
+    }
+
+    /** {@inheritdoc} */
+    public function isGrayedOut() {
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function canLoadAjax() {
+        return true;
+    }
+
+    /**
+     * Return a menu item for this chart.
+     *
+     * @return Menu|null
+     */
+    public function getChartMenu(Individual $individual) {
+        return new Menu(
+            $this->getTitle(),
+            'module.php?mod=tree&amp;mod_action=treeview&amp;rootid=' . $individual->getXref() . '&amp;ged=' . $individual->getTree()->getNameUrl(),
+            'menu-chart-tree',
+            array('rel' => 'nofollow')
+        );
+    }
+
+    /**
+     * Return a menu item for this chart - for use in individual boxes.
+     *
+     * @return Menu|null
+     */
+    public function getBoxChartMenu(Individual $individual) {
+        return $this->getChartMenu($individual);
+    }
+
+    /** {@inheritdoc} */
+    public function getPreLoadContent() {
+        // We cannot use jQuery("head").append(<link rel="stylesheet" ...as jQuery is not loaded at this time
+        return
+            '<script>
 			if (document.createStyleSheet) {
 				document.createStyleSheet("' . $this->css() . '"); // For Internet Explorer
 			} else {
@@ -110,83 +110,83 @@ 
 				document.getElementsByTagName("head")[0].appendChild(newSheet);
 			}
 			</script>';
-	}
-
-	/**
-	 * This is a general purpose hook, allowing modules to respond to routes
-	 * of the form module.php?mod=FOO&mod_action=BAR
-	 *
-	 * @param string $mod_action
-	 */
-	public function modAction($mod_action) {
-		global $controller, $WT_TREE;
-
-		switch ($mod_action) {
-		case 'treeview':
-			$controller = new ChartController;
-			$tv         = new TreeView('tv');
-			ob_start();
-
-			$person = $controller->getSignificantIndividual();
-
-			list($html, $js) = $tv->drawViewport($person, 4);
-
-			$controller
-				->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
-				->pageHeader()
-				->addExternalJavascript($this->js())
-				->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
-				->addInlineJavascript($js)
-				->addInlineJavascript('
+    }
+
+    /**
+     * This is a general purpose hook, allowing modules to respond to routes
+     * of the form module.php?mod=FOO&mod_action=BAR
+     *
+     * @param string $mod_action
+     */
+    public function modAction($mod_action) {
+        global $controller, $WT_TREE;
+
+        switch ($mod_action) {
+        case 'treeview':
+            $controller = new ChartController;
+            $tv         = new TreeView('tv');
+            ob_start();
+
+            $person = $controller->getSignificantIndividual();
+
+            list($html, $js) = $tv->drawViewport($person, 4);
+
+            $controller
+                ->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
+                ->pageHeader()
+                ->addExternalJavascript($this->js())
+                ->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
+                ->addInlineJavascript($js)
+                ->addInlineJavascript('
 					if (document.createStyleSheet) {
 						document.createStyleSheet("' . $this->css() . '"); // For Internet Explorer
 					} else {
 						jQuery("head").append(\'<link rel="stylesheet" type="text/css" href="' . $this->css() . '">\');
 					}
 				');
-			echo $html;
-			break;
-
-		case 'getDetails':
-			header('Content-Type: text/html; charset=UTF-8');
-			$pid        = Filter::get('pid', WT_REGEX_XREF);
-			$i          = Filter::get('instance');
-			$tv         = new TreeView($i);
-			$individual = Individual::getInstance($pid, $WT_TREE);
-			if ($individual) {
-				echo $tv->getDetails($individual);
-			}
-			break;
-
-		case 'getPersons':
-			header('Content-Type: text/html; charset=UTF-8');
-			$q  = Filter::get('q');
-			$i  = Filter::get('instance');
-			$tv = new TreeView($i);
-			echo $tv->getPersons($q);
-			break;
-
-		default:
-			http_response_code(404);
-			break;
-		}
-	}
-
-	/**
-	 * URL for our style sheet.
-	 *
-	 * @return string
-	 */
-	public function css() {
-		return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/css/treeview.css';
-	}
-
-	/**
-	 * URL for our JavaScript.
-	 *
-	 * @return string
-	 */
-	public function js() {
-		return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/js/treeview.js';
-	}
+            echo $html;
+            break;
+
+        case 'getDetails':
+            header('Content-Type: text/html; charset=UTF-8');
+            $pid        = Filter::get('pid', WT_REGEX_XREF);
+            $i          = Filter::get('instance');
+            $tv         = new TreeView($i);
+            $individual = Individual::getInstance($pid, $WT_TREE);
+            if ($individual) {
+                echo $tv->getDetails($individual);
+            }
+            break;
+
+        case 'getPersons':
+            header('Content-Type: text/html; charset=UTF-8');
+            $q  = Filter::get('q');
+            $i  = Filter::get('instance');
+            $tv = new TreeView($i);
+            echo $tv->getPersons($q);
+            break;
+
+        default:
+            http_response_code(404);
+            break;
+        }
+    }
+
+    /**
+     * URL for our style sheet.
+     *
+     * @return string
+     */
+    public function css() {
+        return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/css/treeview.css';
+    }
+
+    /**
+     * URL for our JavaScript.
+     *
+     * @return string
+     */
+    public function js() {
+        return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/js/treeview.js';
+    }
 }

Switch Indentation +41 added lines, -41 removed lines

@@ -122,53 +122,53 @@
 		global $controller, $WT_TREE;
 
 		switch ($mod_action) {
-		case 'treeview':
-			$controller = new ChartController;
-			$tv         = new TreeView('tv');
-			ob_start();
-
-			$person = $controller->getSignificantIndividual();
-
-			list($html, $js) = $tv->drawViewport($person, 4);
-
-			$controller
-				->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
-				->pageHeader()
-				->addExternalJavascript($this->js())
-				->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
-				->addInlineJavascript($js)
-				->addInlineJavascript('
+		    case 'treeview':
+			    $controller = new ChartController;
+			    $tv         = new TreeView('tv');
+			    ob_start();
+
+			    $person = $controller->getSignificantIndividual();
+
+			    list($html, $js) = $tv->drawViewport($person, 4);
+
+			    $controller
+				    ->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
+				    ->pageHeader()
+				    ->addExternalJavascript($this->js())
+				    ->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
+				    ->addInlineJavascript($js)
+				    ->addInlineJavascript('
 					if (document.createStyleSheet) {
 						document.createStyleSheet("' . $this->css() . '"); // For Internet Explorer
 					} else {
 						jQuery("head").append(\'<link rel="stylesheet" type="text/css" href="' . $this->css() . '">\');
 					}
 				');
-			echo $html;
-			break;
-
-		case 'getDetails':
-			header('Content-Type: text/html; charset=UTF-8');
-			$pid        = Filter::get('pid', WT_REGEX_XREF);
-			$i          = Filter::get('instance');
-			$tv         = new TreeView($i);
-			$individual = Individual::getInstance($pid, $WT_TREE);
-			if ($individual) {
-				echo $tv->getDetails($individual);
-			}
-			break;
-
-		case 'getPersons':
-			header('Content-Type: text/html; charset=UTF-8');
-			$q  = Filter::get('q');
-			$i  = Filter::get('instance');
-			$tv = new TreeView($i);
-			echo $tv->getPersons($q);
-			break;
-
-		default:
-			http_response_code(404);
-			break;
+			    echo $html;
+			    break;
+
+		    case 'getDetails':
+			    header('Content-Type: text/html; charset=UTF-8');
+			    $pid        = Filter::get('pid', WT_REGEX_XREF);
+			    $i          = Filter::get('instance');
+			    $tv         = new TreeView($i);
+			    $individual = Individual::getInstance($pid, $WT_TREE);
+			    if ($individual) {
+				    echo $tv->getDetails($individual);
+			    }
+			    break;
+
+		    case 'getPersons':
+			    header('Content-Type: text/html; charset=UTF-8');
+			    $q  = Filter::get('q');
+			    $i  = Filter::get('instance');
+			    $tv = new TreeView($i);
+			    echo $tv->getPersons($q);
+			    break;
+
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 

Braces +26 added lines, -13 removed lines

@@ -29,22 +29,26 @@ 
  */
 class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface, ModuleChartInterface {
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Interactive tree');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Interactive tree” module */ I18N::translate('An interactive tree, showing all the ancestors and descendants of an individual.');
 	}
 
 	/** {@inheritdoc} */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 68;
 	}
 
 	/** {@inheritdoc} */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $controller;
 
 		$tv              = new TreeView('tvTab');
@@ -58,17 +62,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		return !Auth::isSearchEngine();
 	}
 
 	/** {@inheritdoc} */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return true;
 	}
 
@@ -77,7 +84,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'module.php?mod=tree&mod_action=treeview&rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -91,12 +99,14 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 
 	/** {@inheritdoc} */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		// We cannot use jQuery("head").append(<link rel="stylesheet" ...as jQuery is not loaded at this time
 		return
 			'<script>
@@ -118,7 +128,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		global $controller, $WT_TREE;
 
 		switch ($mod_action) {
@@ -177,7 +188,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function css() {
+	public function css()
+	{
 		return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/css/treeview.css';
 	}
 
@@ -186,7 +198,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function js() {
+	public function js()
+	{
 		return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/js/treeview.js';
 	}
 }

app/Module/RecentChangesModule.php

Indentation +338 added lines, -338 removed lines

@@ -31,273 +31,273 @@ 
  * Class RecentChangesModule
  */
 class RecentChangesModule extends AbstractModule implements ModuleBlockInterface {
-	const DEFAULT_BLOCK      = '1';
-	const DEFAULT_DAYS       = 7;
-	const DEFAULT_HIDE_EMPTY = '0';
-	const DEFAULT_SHOW_USER  = '1';
-	const DEFAULT_SORT_STYLE = 'date_desc';
-	const DEFAULT_INFO_STYLE = 'table';
-	const MAX_DAYS           = 90;
-
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Recent changes');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Recent changes” module */ I18N::translate('A list of records that have been updated recently.');
-	}
-
-	/** {@inheritdoc} */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		global $ctype, $WT_TREE;
-
-		$days       = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
-		$infoStyle  = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_INFO_STYLE);
-		$sortStyle  = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT_STYLE);
-		$show_user  = $this->getBlockSetting($block_id, 'show_user', self::DEFAULT_SHOW_USER);
-		$block      = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
-		$hide_empty = $this->getBlockSetting($block_id, 'hide_empty', self::DEFAULT_HIDE_EMPTY);
-
-		foreach (array('days', 'infoStyle', 'sortStyle', 'hide_empty', 'show_user', 'block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-
-		$records = $this->getRecentChanges($WT_TREE, WT_CLIENT_JD - $days);
-
-		if (empty($records) && $hide_empty) {
-			return '';
-		}
-
-		// Print block header
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-
-		if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-		} else {
-			$title = '';
-		}
-		$title .= /* I18N: title for list of recent changes */ I18N::plural('Changes in the last %s day', 'Changes in the last %s days', $days, I18N::number($days));
-
-		$content = '';
-		// Print block content
-		if (count($records) == 0) {
-			$content .= I18N::plural('There have been no changes within the last %s day.', 'There have been no changes within the last %s days.', $days, I18N::number($days));
-		} else {
-			switch ($infoStyle) {
-			case 'list':
-				$content .= $this->changesList($records, $sortStyle, $show_user);
-				break;
-			case 'table':
-				$content .= $this->changesTable($records, $sortStyle, $show_user);
-				break;
-			}
-		}
-
-		if ($template) {
-			if ($block) {
-				$class .= ' small_inner_block';
-			}
-
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'days', Filter::postInteger('days', 1, self::MAX_DAYS));
-			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table'));
-			$this->setBlockSetting($block_id, 'sortStyle', Filter::post('sortStyle', 'name|date_asc|date_desc'));
-			$this->setBlockSetting($block_id, 'show_user', Filter::postBool('show_user'));
-			$this->setBlockSetting($block_id, 'hide_empty', Filter::postBool('hide_empty'));
-			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
-		}
-
-		$days       = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
-		$infoStyle  = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_INFO_STYLE);
-		$sortStyle  = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT_STYLE);
-		$show_user  = $this->getBlockSetting($block_id, 'show_user', self::DEFAULT_SHOW_USER);
-		$block      = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
-		$hide_empty = $this->getBlockSetting($block_id, 'hide_empty', self::DEFAULT_HIDE_EMPTY);
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Number of days to show');
-		echo '</td><td class="optionbox">';
-		echo '<input type="text" name="days" size="2" value="', $days, '">';
-		echo ' <em>', I18N::plural('maximum %s day', 'maximum %s days', I18N::number(self::MAX_DAYS), I18N::number(self::MAX_DAYS)), '</em>';
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Presentation style');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('list'), 'table' => I18N::translate('table')), null, $infoStyle, '');
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Sort order');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::selectEditControl('sortStyle', array(
-			'name'      => /* I18N: An option in a list-box */ I18N::translate('sort by name'),
-			'date_asc'  => /* I18N: An option in a list-box */ I18N::translate('sort by date, oldest first'),
-			'date_desc' => /* I18N: An option in a list-box */ I18N::translate('sort by date, newest first'),
-		), null, $sortStyle, '');
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a yes/no option */ I18N::translate('Show the user who made the change');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('show_user', $show_user);
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('block', $block);
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Should this block be hidden when it is empty');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('hide_empty', $hide_empty);
-		echo '</td></tr>';
-		echo '<tr><td colspan="2" class="optionbox wrap">';
-		echo '<span class="error">', I18N::translate('If you hide an empty block, you will not be able to change its configuration until it becomes visible by no longer being empty.'), '</span>';
-		echo '</td></tr>';
-	}
-
-	/**
-	 * Find records that have changed since a given julian day
-	 *
-	 * @param Tree $tree Changes for which tree
-	 * @param int  $jd   Julian day
-	 *
-	 * @return GedcomRecord[] List of records with changes
-	 */
-	private function getRecentChanges(Tree $tree, $jd) {
-		$sql =
-			"SELECT d_gid FROM `##dates`" .
-			" WHERE d_fact='CHAN' AND d_julianday1 >= :jd AND d_file = :tree_id";
-
-		$vars = array(
-			'jd'      => $jd,
-			'tree_id' => $tree->getTreeId(),
-		);
-
-		$xrefs = Database::prepare($sql)->execute($vars)->fetchOneColumn();
-
-		$records = array();
-		foreach ($xrefs as $xref) {
-			$record = GedcomRecord::getInstance($xref, $tree);
-			if ($record->canShow()) {
-				$records[] = $record;
-			}
-		}
-
-		return $records;
-	}
-
-	/**
-	 * Format a table of events
-	 *
-	 * @param GedcomRecord[] $records
-	 * @param string         $sort
-	 * @param bool           $show_user
-	 *
-	 * @return string
-	 */
-	private function changesList(array $records, $sort, $show_user) {
-		switch ($sort) {
-		case 'name':
-			uasort($records, array('self', 'sortByNameAndChangeDate'));
-			break;
-		case 'date_asc':
-			uasort($records, array('self', 'sortByChangeDateAndName'));
-			$records = array_reverse($records);
-			break;
-		case 'date_desc':
-			uasort($records, array('self', 'sortByChangeDateAndName'));
-		}
-
-		$html = '';
-		foreach ($records as $record) {
-			$html .= '<a href="' . $record->getHtmlUrl() . '" class="list_item name2">' . $record->getFullName() . '</a>';
-			$html .= '<div class="indent" style="margin-bottom: 5px;">';
-			if ($record instanceof Individual) {
-				if ($record->getAddName()) {
-					$html .= '<a href="' . $record->getHtmlUrl() . '" class="list_item">' . $record->getAddName() . '</a>';
-				}
-			}
-
-			// The timestamp may be missing or private.
-			$timestamp = $record->lastChangeTimestamp();
-			if ($timestamp !== '') {
-				if ($show_user) {
-					$html .= /* I18N: [a record was] Changed on <date/time> by <user> */
-						I18N::translate('Changed on %1$s by %2$s', $timestamp, Filter::escapeHtml($record->lastChangeUser()));
-				} else {
-					$html .= /* I18N: [a record was] Changed on <date/time> */
-						I18N::translate('Changed on %1$s', $timestamp);
-				}
-			}
-			$html .= '</div>';
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Format a table of events
-	 *
-	 * @param GedcomRecord[] $records
-	 * @param string         $sort
-	 * @param bool           $show_user
-	 *
-	 * @return string
-	 */
-	private function changesTable($records, $sort, $show_user) {
-		global $controller;
-
-		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
-
-		switch ($sort) {
-		case 'name':
-		default:
-			$aaSorting = "[1,'asc'], [2,'desc']";
-			break;
-		case 'date_asc':
-			$aaSorting = "[2,'asc'], [1,'asc']";
-			break;
-		case 'date_desc':
-			$aaSorting = "[2,'desc'], [1,'asc']";
-			break;
-		}
-
-		$html = '';
-		$controller
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+    const DEFAULT_BLOCK      = '1';
+    const DEFAULT_DAYS       = 7;
+    const DEFAULT_HIDE_EMPTY = '0';
+    const DEFAULT_SHOW_USER  = '1';
+    const DEFAULT_SORT_STYLE = 'date_desc';
+    const DEFAULT_INFO_STYLE = 'table';
+    const MAX_DAYS           = 90;
+
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Recent changes');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Recent changes” module */ I18N::translate('A list of records that have been updated recently.');
+    }
+
+    /** {@inheritdoc} */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        global $ctype, $WT_TREE;
+
+        $days       = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
+        $infoStyle  = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_INFO_STYLE);
+        $sortStyle  = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT_STYLE);
+        $show_user  = $this->getBlockSetting($block_id, 'show_user', self::DEFAULT_SHOW_USER);
+        $block      = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
+        $hide_empty = $this->getBlockSetting($block_id, 'hide_empty', self::DEFAULT_HIDE_EMPTY);
+
+        foreach (array('days', 'infoStyle', 'sortStyle', 'hide_empty', 'show_user', 'block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+
+        $records = $this->getRecentChanges($WT_TREE, WT_CLIENT_JD - $days);
+
+        if (empty($records) && $hide_empty) {
+            return '';
+        }
+
+        // Print block header
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+
+        if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+            $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+        } else {
+            $title = '';
+        }
+        $title .= /* I18N: title for list of recent changes */ I18N::plural('Changes in the last %s day', 'Changes in the last %s days', $days, I18N::number($days));
+
+        $content = '';
+        // Print block content
+        if (count($records) == 0) {
+            $content .= I18N::plural('There have been no changes within the last %s day.', 'There have been no changes within the last %s days.', $days, I18N::number($days));
+        } else {
+            switch ($infoStyle) {
+            case 'list':
+                $content .= $this->changesList($records, $sortStyle, $show_user);
+                break;
+            case 'table':
+                $content .= $this->changesTable($records, $sortStyle, $show_user);
+                break;
+            }
+        }
+
+        if ($template) {
+            if ($block) {
+                $class .= ' small_inner_block';
+            }
+
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'days', Filter::postInteger('days', 1, self::MAX_DAYS));
+            $this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table'));
+            $this->setBlockSetting($block_id, 'sortStyle', Filter::post('sortStyle', 'name|date_asc|date_desc'));
+            $this->setBlockSetting($block_id, 'show_user', Filter::postBool('show_user'));
+            $this->setBlockSetting($block_id, 'hide_empty', Filter::postBool('hide_empty'));
+            $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
+        }
+
+        $days       = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
+        $infoStyle  = $this->getBlockSetting($block_id, 'infoStyle', self::DEFAULT_INFO_STYLE);
+        $sortStyle  = $this->getBlockSetting($block_id, 'sortStyle', self::DEFAULT_SORT_STYLE);
+        $show_user  = $this->getBlockSetting($block_id, 'show_user', self::DEFAULT_SHOW_USER);
+        $block      = $this->getBlockSetting($block_id, 'block', self::DEFAULT_BLOCK);
+        $hide_empty = $this->getBlockSetting($block_id, 'hide_empty', self::DEFAULT_HIDE_EMPTY);
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Number of days to show');
+        echo '</td><td class="optionbox">';
+        echo '<input type="text" name="days" size="2" value="', $days, '">';
+        echo ' <em>', I18N::plural('maximum %s day', 'maximum %s days', I18N::number(self::MAX_DAYS), I18N::number(self::MAX_DAYS)), '</em>';
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Presentation style');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('list'), 'table' => I18N::translate('table')), null, $infoStyle, '');
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Sort order');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::selectEditControl('sortStyle', array(
+            'name'      => /* I18N: An option in a list-box */ I18N::translate('sort by name'),
+            'date_asc'  => /* I18N: An option in a list-box */ I18N::translate('sort by date, oldest first'),
+            'date_desc' => /* I18N: An option in a list-box */ I18N::translate('sort by date, newest first'),
+        ), null, $sortStyle, '');
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: label for a yes/no option */ I18N::translate('Show the user who made the change');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('show_user', $show_user);
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('block', $block);
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Should this block be hidden when it is empty');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('hide_empty', $hide_empty);
+        echo '</td></tr>';
+        echo '<tr><td colspan="2" class="optionbox wrap">';
+        echo '<span class="error">', I18N::translate('If you hide an empty block, you will not be able to change its configuration until it becomes visible by no longer being empty.'), '</span>';
+        echo '</td></tr>';
+    }
+
+    /**
+     * Find records that have changed since a given julian day
+     *
+     * @param Tree $tree Changes for which tree
+     * @param int  $jd   Julian day
+     *
+     * @return GedcomRecord[] List of records with changes
+     */
+    private function getRecentChanges(Tree $tree, $jd) {
+        $sql =
+            "SELECT d_gid FROM `##dates`" .
+            " WHERE d_fact='CHAN' AND d_julianday1 >= :jd AND d_file = :tree_id";
+
+        $vars = array(
+            'jd'      => $jd,
+            'tree_id' => $tree->getTreeId(),
+        );
+
+        $xrefs = Database::prepare($sql)->execute($vars)->fetchOneColumn();
+
+        $records = array();
+        foreach ($xrefs as $xref) {
+            $record = GedcomRecord::getInstance($xref, $tree);
+            if ($record->canShow()) {
+                $records[] = $record;
+            }
+        }
+
+        return $records;
+    }
+
+    /**
+     * Format a table of events
+     *
+     * @param GedcomRecord[] $records
+     * @param string         $sort
+     * @param bool           $show_user
+     *
+     * @return string
+     */
+    private function changesList(array $records, $sort, $show_user) {
+        switch ($sort) {
+        case 'name':
+            uasort($records, array('self', 'sortByNameAndChangeDate'));
+            break;
+        case 'date_asc':
+            uasort($records, array('self', 'sortByChangeDateAndName'));
+            $records = array_reverse($records);
+            break;
+        case 'date_desc':
+            uasort($records, array('self', 'sortByChangeDateAndName'));
+        }
+
+        $html = '';
+        foreach ($records as $record) {
+            $html .= '<a href="' . $record->getHtmlUrl() . '" class="list_item name2">' . $record->getFullName() . '</a>';
+            $html .= '<div class="indent" style="margin-bottom: 5px;">';
+            if ($record instanceof Individual) {
+                if ($record->getAddName()) {
+                    $html .= '<a href="' . $record->getHtmlUrl() . '" class="list_item">' . $record->getAddName() . '</a>';
+                }
+            }
+
+            // The timestamp may be missing or private.
+            $timestamp = $record->lastChangeTimestamp();
+            if ($timestamp !== '') {
+                if ($show_user) {
+                    $html .= /* I18N: [a record was] Changed on <date/time> by <user> */
+                        I18N::translate('Changed on %1$s by %2$s', $timestamp, Filter::escapeHtml($record->lastChangeUser()));
+                } else {
+                    $html .= /* I18N: [a record was] Changed on <date/time> */
+                        I18N::translate('Changed on %1$s', $timestamp);
+                }
+            }
+            $html .= '</div>';
+        }
+
+        return $html;
+    }
+
+    /**
+     * Format a table of events
+     *
+     * @param GedcomRecord[] $records
+     * @param string         $sort
+     * @param bool           $show_user
+     *
+     * @return string
+     */
+    private function changesTable($records, $sort, $show_user) {
+        global $controller;
+
+        $table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
+
+        switch ($sort) {
+        case 'name':
+        default:
+            $aaSorting = "[1,'asc'], [2,'desc']";
+            break;
+        case 'date_asc':
+            $aaSorting = "[2,'asc'], [1,'asc']";
+            break;
+        case 'date_desc':
+            $aaSorting = "[2,'desc'], [1,'asc']";
+            break;
+        }
+
+        $html = '';
+        $controller
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery("#' . $table_id . '").dataTable({
 					dom: \'t\',
 					paging: false,
@@ -316,75 +316,75 @@ 
 				});
 			');
 
-		$html .= '<table id="' . $table_id . '" class="width100">';
-		$html .= '<thead><tr>';
-		$html .= '<th></th>';
-		$html .= '<th>' . I18N::translate('Record') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
-		$html .= '<th>' . GedcomTag::getLabel('_WT_USER') . '</th>';
-		$html .= '</tr></thead><tbody>';
-
-		foreach ($records as $record) {
-			$html .= '<tr><td>';
-			switch ($record::RECORD_TYPE) {
-			case 'INDI':
-				$html .= $record->getSexImage('small');
-				break;
-			case 'FAM':
-				$html .= '<i class="icon-button_family"></i>';
-				break;
-			case 'OBJE':
-				$html .= '<i class="icon-button_media"></i>';
-				break;
-			case 'NOTE':
-				$html .= '<i class="icon-button_note"></i>';
-				break;
-			case 'SOUR':
-				$html .= '<i class="icon-button_source"></i>';
-				break;
-			case 'REPO':
-				$html .= '<i class="icon-button_repository"></i>';
-				break;
-			}
-			$html .= '</td>';
-			$html .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '">';
-			$html .= '<a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a>';
-			$addname = $record->getAddName();
-			if ($addname) {
-				$html .= '<div class="indent"><a href="' . $record->getHtmlUrl() . '">' . $addname . '</a></div>';
-			}
-			$html .= '</td>';
-			$html .= '<td data-sort="' . $record->lastChangeTimestamp(true) . '">' . $record->lastChangeTimestamp() . '</td>';
-			$html .= '<td>' . Filter::escapeHtml($record->lastChangeUser()) . '</td>';
-			$html .= '</tr>';
-		}
-
-		$html .= '</tbody></table>';
-
-		return $html;
-	}
-
-	/**
-	 * Sort the records by (1) last change date and (2) name
-	 *
-	 * @param GedcomRecord $a
-	 * @param GedcomRecord $b
-	 *
-	 * @return int
-	 */
-	private static function sortByChangeDateAndName(GedcomRecord $a, GedcomRecord $b) {
-		return $b->lastChangeTimestamp(true) - $a->lastChangeTimestamp(true) ?: GedcomRecord::compare($a, $b);
-	}
-
-	/**
-	 * Sort the records by (1) name and (2) last change date
-	 *
-	 * @param GedcomRecord $a
-	 * @param GedcomRecord $b
-	 *
-	 * @return int
-	 */
-	private static function sortByNameAndChangeDate(GedcomRecord $a, GedcomRecord $b) {
-		return GedcomRecord::compare($a, $b) ?: $b->lastChangeTimestamp(true) - $a->lastChangeTimestamp(true);
-	}
+        $html .= '<table id="' . $table_id . '" class="width100">';
+        $html .= '<thead><tr>';
+        $html .= '<th></th>';
+        $html .= '<th>' . I18N::translate('Record') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('CHAN') . '</th>';
+        $html .= '<th>' . GedcomTag::getLabel('_WT_USER') . '</th>';
+        $html .= '</tr></thead><tbody>';
+
+        foreach ($records as $record) {
+            $html .= '<tr><td>';
+            switch ($record::RECORD_TYPE) {
+            case 'INDI':
+                $html .= $record->getSexImage('small');
+                break;
+            case 'FAM':
+                $html .= '<i class="icon-button_family"></i>';
+                break;
+            case 'OBJE':
+                $html .= '<i class="icon-button_media"></i>';
+                break;
+            case 'NOTE':
+                $html .= '<i class="icon-button_note"></i>';
+                break;
+            case 'SOUR':
+                $html .= '<i class="icon-button_source"></i>';
+                break;
+            case 'REPO':
+                $html .= '<i class="icon-button_repository"></i>';
+                break;
+            }
+            $html .= '</td>';
+            $html .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '">';
+            $html .= '<a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a>';
+            $addname = $record->getAddName();
+            if ($addname) {
+                $html .= '<div class="indent"><a href="' . $record->getHtmlUrl() . '">' . $addname . '</a></div>';
+            }
+            $html .= '</td>';
+            $html .= '<td data-sort="' . $record->lastChangeTimestamp(true) . '">' . $record->lastChangeTimestamp() . '</td>';
+            $html .= '<td>' . Filter::escapeHtml($record->lastChangeUser()) . '</td>';
+            $html .= '</tr>';
+        }
+
+        $html .= '</tbody></table>';
+
+        return $html;
+    }
+
+    /**
+     * Sort the records by (1) last change date and (2) name
+     *
+     * @param GedcomRecord $a
+     * @param GedcomRecord $b
+     *
+     * @return int
+     */
+    private static function sortByChangeDateAndName(GedcomRecord $a, GedcomRecord $b) {
+        return $b->lastChangeTimestamp(true) - $a->lastChangeTimestamp(true) ?: GedcomRecord::compare($a, $b);
+    }
+
+    /**
+     * Sort the records by (1) name and (2) last change date
+     *
+     * @param GedcomRecord $a
+     * @param GedcomRecord $b
+     *
+     * @return int
+     */
+    private static function sortByNameAndChangeDate(GedcomRecord $a, GedcomRecord $b) {
+        return GedcomRecord::compare($a, $b) ?: $b->lastChangeTimestamp(true) - $a->lastChangeTimestamp(true);
+    }
 }

Switch Indentation +43 added lines, -43 removed lines

@@ -89,12 +89,12 @@ 
 			$content .= I18N::plural('There have been no changes within the last %s day.', 'There have been no changes within the last %s days.', $days, I18N::number($days));
 		} else {
 			switch ($infoStyle) {
-			case 'list':
-				$content .= $this->changesList($records, $sortStyle, $show_user);
-				break;
-			case 'table':
-				$content .= $this->changesTable($records, $sortStyle, $show_user);
-				break;
+			    case 'list':
+				    $content .= $this->changesList($records, $sortStyle, $show_user);
+				    break;
+			    case 'table':
+				    $content .= $this->changesTable($records, $sortStyle, $show_user);
+				    break;
 			}
 		}
 
@@ -229,15 +229,15 @@ 
 	 */
 	private function changesList(array $records, $sort, $show_user) {
 		switch ($sort) {
-		case 'name':
-			uasort($records, array('self', 'sortByNameAndChangeDate'));
-			break;
-		case 'date_asc':
-			uasort($records, array('self', 'sortByChangeDateAndName'));
-			$records = array_reverse($records);
-			break;
-		case 'date_desc':
-			uasort($records, array('self', 'sortByChangeDateAndName'));
+		    case 'name':
+			    uasort($records, array('self', 'sortByNameAndChangeDate'));
+			    break;
+		    case 'date_asc':
+			    uasort($records, array('self', 'sortByChangeDateAndName'));
+			    $records = array_reverse($records);
+			    break;
+		    case 'date_desc':
+			    uasort($records, array('self', 'sortByChangeDateAndName'));
 		}
 
 		$html = '';
@@ -282,16 +282,16 @@ 
 		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
 
 		switch ($sort) {
-		case 'name':
-		default:
-			$aaSorting = "[1,'asc'], [2,'desc']";
-			break;
-		case 'date_asc':
-			$aaSorting = "[2,'asc'], [1,'asc']";
-			break;
-		case 'date_desc':
-			$aaSorting = "[2,'desc'], [1,'asc']";
-			break;
+		    case 'name':
+		    default:
+			    $aaSorting = "[1,'asc'], [2,'desc']";
+			    break;
+		    case 'date_asc':
+			    $aaSorting = "[2,'asc'], [1,'asc']";
+			    break;
+		    case 'date_desc':
+			    $aaSorting = "[2,'desc'], [1,'asc']";
+			    break;
 		}
 
 		$html = '';
@@ -327,24 +327,24 @@ 
 		foreach ($records as $record) {
 			$html .= '<tr><td>';
 			switch ($record::RECORD_TYPE) {
-			case 'INDI':
-				$html .= $record->getSexImage('small');
-				break;
-			case 'FAM':
-				$html .= '<i class="icon-button_family"></i>';
-				break;
-			case 'OBJE':
-				$html .= '<i class="icon-button_media"></i>';
-				break;
-			case 'NOTE':
-				$html .= '<i class="icon-button_note"></i>';
-				break;
-			case 'SOUR':
-				$html .= '<i class="icon-button_source"></i>';
-				break;
-			case 'REPO':
-				$html .= '<i class="icon-button_repository"></i>';
-				break;
+			    case 'INDI':
+				    $html .= $record->getSexImage('small');
+				    break;
+			    case 'FAM':
+				    $html .= '<i class="icon-button_family"></i>';
+				    break;
+			    case 'OBJE':
+				    $html .= '<i class="icon-button_media"></i>';
+				    break;
+			    case 'NOTE':
+				    $html .= '<i class="icon-button_note"></i>';
+				    break;
+			    case 'SOUR':
+				    $html .= '<i class="icon-button_source"></i>';
+				    break;
+			    case 'REPO':
+				    $html .= '<i class="icon-button_repository"></i>';
+				    break;
 			}
 			$html .= '</td>';
 			$html .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '">';

Braces +26 added lines, -13 removed lines

@@ -30,7 +30,8 @@ 
 /**
  * Class RecentChangesModule
  */
-class RecentChangesModule extends AbstractModule implements ModuleBlockInterface {
+class RecentChangesModule extends AbstractModule implements ModuleBlockInterface
+{
 	const DEFAULT_BLOCK      = '1';
 	const DEFAULT_DAYS       = 7;
 	const DEFAULT_HIDE_EMPTY = '0';
@@ -40,17 +41,20 @@ 
 	const MAX_DAYS           = 90;
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Recent changes');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Recent changes” module */ I18N::translate('A list of records that have been updated recently.');
 	}
 
 	/** {@inheritdoc} */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $ctype, $WT_TREE;
 
 		$days       = $this->getBlockSetting($block_id, 'days', self::DEFAULT_DAYS);
@@ -110,22 +114,26 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'days', Filter::postInteger('days', 1, self::MAX_DAYS));
 			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table'));
@@ -195,7 +203,8 @@ 
 	 *
 	 * @return GedcomRecord[] List of records with changes
 	 */
-	private function getRecentChanges(Tree $tree, $jd) {
+	private function getRecentChanges(Tree $tree, $jd)
+	{
 		$sql =
 			"SELECT d_gid FROM `##dates`" .
 			" WHERE d_fact='CHAN' AND d_julianday1 >= :jd AND d_file = :tree_id";
@@ -227,7 +236,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function changesList(array $records, $sort, $show_user) {
+	private function changesList(array $records, $sort, $show_user)
+	{
 		switch ($sort) {
 		case 'name':
 			uasort($records, array('self', 'sortByNameAndChangeDate'));
@@ -276,7 +286,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function changesTable($records, $sort, $show_user) {
+	private function changesTable($records, $sort, $show_user)
+	{
 		global $controller;
 
 		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
@@ -372,7 +383,8 @@ 
 	 *
 	 * @return int
 	 */
-	private static function sortByChangeDateAndName(GedcomRecord $a, GedcomRecord $b) {
+	private static function sortByChangeDateAndName(GedcomRecord $a, GedcomRecord $b)
+	{
 		return $b->lastChangeTimestamp(true) - $a->lastChangeTimestamp(true) ?: GedcomRecord::compare($a, $b);
 	}
 
@@ -384,7 +396,8 @@ 
 	 *
 	 * @return int
 	 */
-	private static function sortByNameAndChangeDate(GedcomRecord $a, GedcomRecord $b) {
+	private static function sortByNameAndChangeDate(GedcomRecord $a, GedcomRecord $b)
+	{
 		return GedcomRecord::compare($a, $b) ?: $b->lastChangeTimestamp(true) - $a->lastChangeTimestamp(true);
 	}
 }

app/Module/TopGivenNamesModule.php

Indentation +125 added lines, -125 removed lines

@@ -26,132 +26,132 @@
  * Class TopGivenNamesModule
  */
 class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top given names');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Top given names” module */ I18N::translate('A list of the most popular given names.');
-	}
-
-	/**
-	 * 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;
-
-		$num       = $this->getBlockSetting($block_id, 'num', '10');
-		$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
-
-		foreach (array('num', 'infoStyle') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-
-		$stats = new Stats($WT_TREE);
-
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-		} else {
-			$title = '';
-		}
-		if ($num == 1) {
-			// I18N: i.e. most popular given name.
-			$title .= I18N::translate('Top given name');
-		} else {
-			// I18N: Title for a list of the most common given names, %s is a number. Note that a separate translation exists when %s is 1
-			$title .= I18N::plural('Top %s given name', 'Top %s given names', $num, I18N::number($num));
-		}
-
-		$content = '<div class="normal_inner_block">';
-		//Select List or Table
-		switch ($infoStyle) {
-		case "list": // Output style 1:  Simple list style. Better suited to left side of page.
-			if (I18N::direction() === 'ltr') {
-				$padding = 'padding-left: 15px';
-			} else {
-				$padding = 'padding-right: 15px';
-			}
-			$params = array(1, $num, 'rcount');
-			// List Female names
-			$totals = $stats->commonGivenFemaleTotals($params);
-			if ($totals) {
-				$content .= '<b>' . I18N::translate('Females') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
-			}
-			// List Male names
-			$totals = $stats->commonGivenMaleTotals($params);
-			if ($totals) {
-				$content .= '<b>' . I18N::translate('Males') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
-			}
-			break;
-		case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page
-			$params = array(1, $num, 'rcount');
-			$content .= '<table style="margin:auto;">
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top given names');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Top given names” module */ I18N::translate('A list of the most popular given names.');
+    }
+
+    /**
+     * 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;
+
+        $num       = $this->getBlockSetting($block_id, 'num', '10');
+        $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
+
+        foreach (array('num', 'infoStyle') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+
+        $stats = new Stats($WT_TREE);
+
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+            $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+        } else {
+            $title = '';
+        }
+        if ($num == 1) {
+            // I18N: i.e. most popular given name.
+            $title .= I18N::translate('Top given name');
+        } else {
+            // I18N: Title for a list of the most common given names, %s is a number. Note that a separate translation exists when %s is 1
+            $title .= I18N::plural('Top %s given name', 'Top %s given names', $num, I18N::number($num));
+        }
+
+        $content = '<div class="normal_inner_block">';
+        //Select List or Table
+        switch ($infoStyle) {
+        case "list": // Output style 1:  Simple list style. Better suited to left side of page.
+            if (I18N::direction() === 'ltr') {
+                $padding = 'padding-left: 15px';
+            } else {
+                $padding = 'padding-right: 15px';
+            }
+            $params = array(1, $num, 'rcount');
+            // List Female names
+            $totals = $stats->commonGivenFemaleTotals($params);
+            if ($totals) {
+                $content .= '<b>' . I18N::translate('Females') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
+            }
+            // List Male names
+            $totals = $stats->commonGivenMaleTotals($params);
+            if ($totals) {
+                $content .= '<b>' . I18N::translate('Males') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
+            }
+            break;
+        case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page
+            $params = array(1, $num, 'rcount');
+            $content .= '<table style="margin:auto;">
 						<tr>
 						<td>' . $stats->commonGivenFemaleTable($params) . '</td>
 						<td>' . $stats->commonGivenMaleTable($params) . '</td>';
-			$content .= '</tr></table>';
-			break;
-		}
-		$content .= "</div>";
-
-		if ($template) {
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
-			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));
-		}
-
-		$num       = $this->getBlockSetting($block_id, 'num', '10');
-		$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: ... to show in a list */ I18N::translate('Number of given names');
-		echo '</td><td class="optionbox">';
-		echo '<input type="text" name="num" size="2" value="', $num, '">';
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo I18N::translate('Presentation style');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('list'), 'table' => I18N::translate('table')), null, $infoStyle, '');
-		echo '</td></tr>';
-	}
+            $content .= '</tr></table>';
+            break;
+        }
+        $content .= "</div>";
+
+        if ($template) {
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
+            $this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));
+        }
+
+        $num       = $this->getBlockSetting($block_id, 'num', '10');
+        $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: ... to show in a list */ I18N::translate('Number of given names');
+        echo '</td><td class="optionbox">';
+        echo '<input type="text" name="num" size="2" value="', $num, '">';
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo I18N::translate('Presentation style');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('list'), 'table' => I18N::translate('table')), null, $infoStyle, '');
+        echo '</td></tr>';
+    }
 }

Switch Indentation +23 added lines, -23 removed lines

@@ -77,32 +77,32 @@
 		$content = '<div class="normal_inner_block">';
 		//Select List or Table
 		switch ($infoStyle) {
-		case "list": // Output style 1:  Simple list style. Better suited to left side of page.
-			if (I18N::direction() === 'ltr') {
-				$padding = 'padding-left: 15px';
-			} else {
-				$padding = 'padding-right: 15px';
-			}
-			$params = array(1, $num, 'rcount');
-			// List Female names
-			$totals = $stats->commonGivenFemaleTotals($params);
-			if ($totals) {
-				$content .= '<b>' . I18N::translate('Females') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
-			}
-			// List Male names
-			$totals = $stats->commonGivenMaleTotals($params);
-			if ($totals) {
-				$content .= '<b>' . I18N::translate('Males') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
-			}
-			break;
-		case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page
-			$params = array(1, $num, 'rcount');
-			$content .= '<table style="margin:auto;">
+		    case "list": // Output style 1:  Simple list style. Better suited to left side of page.
+			    if (I18N::direction() === 'ltr') {
+				    $padding = 'padding-left: 15px';
+			    } else {
+				    $padding = 'padding-right: 15px';
+			    }
+			    $params = array(1, $num, 'rcount');
+			    // List Female names
+			    $totals = $stats->commonGivenFemaleTotals($params);
+			    if ($totals) {
+				    $content .= '<b>' . I18N::translate('Females') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
+			    }
+			    // List Male names
+			    $totals = $stats->commonGivenMaleTotals($params);
+			    if ($totals) {
+				    $content .= '<b>' . I18N::translate('Males') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
+			    }
+			    break;
+		    case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page
+			    $params = array(1, $num, 'rcount');
+			    $content .= '<table style="margin:auto;">
 						<tr>
 						<td>' . $stats->commonGivenFemaleTable($params) . '</td>
 						<td>' . $stats->commonGivenMaleTable($params) . '</td>';
-			$content .= '</tr></table>';
-			break;
+			    $content .= '</tr></table>';
+			    break;
 		}
 		$content .= "</div>";
 

Braces +16 added lines, -8 removed lines

@@ -25,14 +25,17 @@ 
 /**
  * Class TopGivenNamesModule
  */
-class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface {
+class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module. Top=Most common */ I18N::translate('Top given names');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Top given names” module */ I18N::translate('A list of the most popular given names.');
 	}
 
@@ -45,7 +48,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;
 
 		$num       = $this->getBlockSetting($block_id, 'num', '10');
@@ -114,17 +118,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -133,7 +140,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, 'num', Filter::postInteger('num', 1, 10000, 10));
 			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));

app/Module/ModuleThemeInterface.php

Braces +2 added lines, -1 removed lines

@@ -20,5 +20,6 @@
  *
  * This class is not currently used
  */
-interface ModuleThemeInterface {
+interface ModuleThemeInterface
+{
 }

app/Module/DescendancyReportModule.php

Indentation +34 added lines, -34 removed lines

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

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
  * Class IndividualFamiliesReportModule
  */
 class IndividualFamiliesReportModule extends AbstractModule implements ModuleReportInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Name of a module/report */ I18N::translate('Related families');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a module/report */ I18N::translate('Related families');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Related families” */ I18N::translate('A report of the families 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 families” */ I18N::translate('A report of the families 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_USER;
-	}
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_USER;
+    }
 
-	/**
-	 * Return a menu item for this report.
-	 *
-	 * @return Menu
-	 */
-	public function getReportMenu() {
-		global $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 IndividualFamiliesReportModule
  */
-class IndividualFamiliesReportModule extends AbstractModule implements ModuleReportInterface {
+class IndividualFamiliesReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report */ I18N::translate('Related families');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Related families” */ I18N::translate('A report of the families that are closely related to an individual.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_USER;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $controller, $WT_TREE;
 
 		return new Menu(

app/Module/OnThisDayModule.php

Indentation +133 added lines, -133 removed lines

@@ -26,137 +26,137 @@
  * Class OnThisDayModule
  */
 class OnThisDayModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('On this day');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “On this day” module */ I18N::translate('A list of the anniversaries that occur today.');
-	}
-
-	/**
-	 * 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;
-
-		$filter    = $this->getBlockSetting($block_id, 'filter', '1');
-		$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
-		$sortStyle = $this->getBlockSetting($block_id, 'sortStyle', 'alpha');
-		$block     = $this->getBlockSetting($block_id, 'block', '1');
-
-		foreach (array('filter', 'infoStyle', 'sortStyle', 'block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-
-		$todayjd = WT_CLIENT_JD;
-
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-		} else {
-			$title = '';
-		}
-		$title .= $this->getTitle();
-
-		$content = '';
-
-		// If we are only showing living individuals, then we don't need to search for DEAT events.
-		$tags = $filter ? 'BIRT MARR' : 'BIRT MARR DEAT';
-
-		switch ($infoStyle) {
-		case 'list':
-			// Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
-			$content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
-			break;
-		case 'table':
-			// Style 2: New format, tables, big text, etc. Not too good on right side of page
-			ob_start();
-			$content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
-			$content .= ob_get_clean();
-			break;
-		}
-
-		if ($template) {
-			if ($block) {
-				$class .= ' small_inner_block';
-			}
-
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'filter', Filter::postBool('filter'));
-			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));
-			$this->setBlockSetting($block_id, 'sortStyle', Filter::post('sortStyle', 'alpha|anniv', 'alpha'));
-			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
-		}
-
-		$filter    = $this->getBlockSetting($block_id, 'filter', '1');
-		$infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
-		$sortStyle = $this->getBlockSetting($block_id, 'sortStyle', 'alpha');
-		$block     = $this->getBlockSetting($block_id, 'block', '1');
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: Label for a configuration option */ I18N::translate('Show only events of living individuals');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('filter', $filter);
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: Label for a configuration option */ I18N::translate('Presentation style');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('list'), 'table' => I18N::translate('table')), null, $infoStyle, '');
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: Label for a configuration option */ I18N::translate('Sort order');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::selectEditControl('sortStyle', array(
-			/* I18N: An option in a list-box */ 'alpha' => I18N::translate('sort by name'),
-			/* I18N: An option in a list-box */ 'anniv' => I18N::translate('sort by date'),
-		), null, $sortStyle, '');
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('block', $block);
-		echo '</td></tr>';
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('On this day');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “On this day” module */ I18N::translate('A list of the anniversaries that occur today.');
+    }
+
+    /**
+     * 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;
+
+        $filter    = $this->getBlockSetting($block_id, 'filter', '1');
+        $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
+        $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', 'alpha');
+        $block     = $this->getBlockSetting($block_id, 'block', '1');
+
+        foreach (array('filter', 'infoStyle', 'sortStyle', 'block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+
+        $todayjd = WT_CLIENT_JD;
+
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+            $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+        } else {
+            $title = '';
+        }
+        $title .= $this->getTitle();
+
+        $content = '';
+
+        // If we are only showing living individuals, then we don't need to search for DEAT events.
+        $tags = $filter ? 'BIRT MARR' : 'BIRT MARR DEAT';
+
+        switch ($infoStyle) {
+        case 'list':
+            // Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
+            $content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
+            break;
+        case 'table':
+            // Style 2: New format, tables, big text, etc. Not too good on right side of page
+            ob_start();
+            $content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
+            $content .= ob_get_clean();
+            break;
+        }
+
+        if ($template) {
+            if ($block) {
+                $class .= ' small_inner_block';
+            }
+
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'filter', Filter::postBool('filter'));
+            $this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));
+            $this->setBlockSetting($block_id, 'sortStyle', Filter::post('sortStyle', 'alpha|anniv', 'alpha'));
+            $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
+        }
+
+        $filter    = $this->getBlockSetting($block_id, 'filter', '1');
+        $infoStyle = $this->getBlockSetting($block_id, 'infoStyle', 'table');
+        $sortStyle = $this->getBlockSetting($block_id, 'sortStyle', 'alpha');
+        $block     = $this->getBlockSetting($block_id, 'block', '1');
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: Label for a configuration option */ I18N::translate('Show only events of living individuals');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('filter', $filter);
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: Label for a configuration option */ I18N::translate('Presentation style');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::selectEditControl('infoStyle', array('list' => I18N::translate('list'), 'table' => I18N::translate('table')), null, $infoStyle, '');
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: Label for a configuration option */ I18N::translate('Sort order');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::selectEditControl('sortStyle', array(
+            /* I18N: An option in a list-box */ 'alpha' => I18N::translate('sort by name'),
+            /* I18N: An option in a list-box */ 'anniv' => I18N::translate('sort by date'),
+        ), null, $sortStyle, '');
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('block', $block);
+        echo '</td></tr>';
+    }
 }

Switch Indentation +10 added lines, -10 removed lines

@@ -76,16 +76,16 @@
 		$tags = $filter ? 'BIRT MARR' : 'BIRT MARR DEAT';
 
 		switch ($infoStyle) {
-		case 'list':
-			// Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
-			$content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
-			break;
-		case 'table':
-			// Style 2: New format, tables, big text, etc. Not too good on right side of page
-			ob_start();
-			$content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
-			$content .= ob_get_clean();
-			break;
+		    case 'list':
+			    // Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
+			    $content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
+			    break;
+		    case 'table':
+			    // Style 2: New format, tables, big text, etc. Not too good on right side of page
+			    ob_start();
+			    $content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
+			    $content .= ob_get_clean();
+			    break;
 		}
 
 		if ($template) {

Braces +16 added lines, -8 removed lines

@@ -25,14 +25,17 @@ 
 /**
  * Class OnThisDayModule
  */
-class OnThisDayModule extends AbstractModule implements ModuleBlockInterface {
+class OnThisDayModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('On this day');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “On this day” module */ I18N::translate('A list of the anniversaries that occur today.');
 	}
 
@@ -45,7 +48,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;
 
 		$filter    = $this->getBlockSetting($block_id, 'filter', '1');
@@ -100,17 +104,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -119,7 +126,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, 'filter', Filter::postBool('filter'));
 			$this->setBlockSetting($block_id, 'infoStyle', Filter::post('infoStyle', 'list|table', 'table'));