fisharebest / webtrees

app/Module/MarriageReportModule.php

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
  * Class MarriageReportModule
  */
 class MarriageReportModule 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('Marriages');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a module/report */ I18N::translate('Marriages');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Marriages” module */ I18N::translate('A report of individuals who were married 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 “Marriages” module */ I18N::translate('A report of individuals who were married 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 MarriageReportModule
  */
-class MarriageReportModule extends AbstractModule implements ModuleReportInterface {
+class MarriageReportModule 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('Marriages');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Marriages” module */ I18N::translate('A report of individuals who were married 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/FamilyNavigatorModule.php

Indentation +158 added lines, -158 removed lines

@@ -25,44 +25,44 @@ 
  * Class FamilyNavigatorModule
  */
 class FamilyNavigatorModule extends AbstractModule implements ModuleSidebarInterface {
-	const TTL = "<div class='flyout2'>%s</div>";
-	const LNK = "<div class='flyout3' data-href='%s'>%s</div>";
-	const MSG = "<div class='flyout4'>(%s)</div>"; // class flyout4 not used in standard themes
+    const TTL = "<div class='flyout2'>%s</div>";
+    const LNK = "<div class='flyout3' data-href='%s'>%s</div>";
+    const MSG = "<div class='flyout4'>(%s)</div>"; // class flyout4 not used in standard themes
 
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module/sidebar */ I18N::translate('Family navigator');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module/sidebar */ I18N::translate('Family navigator');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Family navigator” module */ I18N::translate('A sidebar showing an individual’s close families and relatives.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Family navigator” module */ I18N::translate('A sidebar showing an individual’s close families and relatives.');
+    }
 
-	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
-		return 20;
-	}
+    /** {@inheritdoc} */
+    public function defaultSidebarOrder() {
+        return 20;
+    }
 
-	/** {@inheritdoc} */
-	public function hasSidebarContent() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function hasSidebarContent() {
+        return true;
+    }
 
-	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
-		return '';
-	}
+    /** {@inheritdoc} */
+    public function getSidebarAjaxContent() {
+        return '';
+    }
 
-	/**
-	 * Load this sidebar synchronously.
-	 *
-	 * @return string
-	 */
-	public function getSidebarContent() {
-		global $controller;
+    /**
+     * Load this sidebar synchronously.
+     *
+     * @return string
+     */
+    public function getSidebarContent() {
+        global $controller;
 
-		$controller->addInlineJavascript('
+        $controller->addInlineJavascript('
 			jQuery("#sb_family_nav_content")
 				.on("click", ".flyout a", function() {
 					return false;
@@ -73,47 +73,47 @@ 
 				});
 		');
 
-		ob_start();
+        ob_start();
 
-		?>
+        ?>
 		<div id="sb_family_nav_content">
 			<table class="nav_content">
 
 		<?php
-		//-- parent families -------------------------------------------------------------
-		foreach ($controller->record->getChildFamilies() as $family) {
-			$this->drawFamily($family, $controller->record->getChildFamilyLabel($family));
-		}
-		//-- step parents ----------------------------------------------------------------
-		foreach ($controller->record->getChildStepFamilies() as $family) {
-			$this->drawFamily($family, $controller->record->getStepFamilyLabel($family));
-		}
-		//-- spouse and children --------------------------------------------------
-		foreach ($controller->record->getSpouseFamilies() as $family) {
-			$this->drawFamily($family, $controller->getSpouseFamilyLabel($family, $controller->record));
-		}
-		//-- step children ----------------------------------------------------------------
-		foreach ($controller->record->getSpouseStepFamilies() as $family) {
-			$this->drawFamily($family, $family->getFullName());
-		}
-		?>
+        //-- parent families -------------------------------------------------------------
+        foreach ($controller->record->getChildFamilies() as $family) {
+            $this->drawFamily($family, $controller->record->getChildFamilyLabel($family));
+        }
+        //-- step parents ----------------------------------------------------------------
+        foreach ($controller->record->getChildStepFamilies() as $family) {
+            $this->drawFamily($family, $controller->record->getStepFamilyLabel($family));
+        }
+        //-- spouse and children --------------------------------------------------
+        foreach ($controller->record->getSpouseFamilies() as $family) {
+            $this->drawFamily($family, $controller->getSpouseFamilyLabel($family, $controller->record));
+        }
+        //-- step children ----------------------------------------------------------------
+        foreach ($controller->record->getSpouseStepFamilies() as $family) {
+            $this->drawFamily($family, $family->getFullName());
+        }
+        ?>
 			</table>
 		</div>
 		<?php
 
-		return ob_get_clean();
-	}
+        return ob_get_clean();
+    }
 
-	/**
-	 * Format a family.
-	 *
-	 * @param Family $family
-	 * @param string $title
-	 */
-	private function drawFamily(Family $family, $title) {
-		global $controller;
+    /**
+     * Format a family.
+     *
+     * @param Family $family
+     * @param string $title
+     */
+    private function drawFamily(Family $family, $title) {
+        global $controller;
 
-		?>
+        ?>
 		<tr>
 			<td class="center" colspan="2">
 				<a class="famnav_title" href="<?php echo $family->getHtmlUrl(); ?>">
@@ -122,11 +122,11 @@ 
 			</td>
 		</tr>
 		<?php
-		foreach ($family->getSpouses() as $spouse) {
-			$menu = new Menu(Functions::getCloseRelationshipName($controller->record, $spouse));
-			$menu->addClass('', 'submenu flyout');
-			$menu->addSubmenu(new Menu($this->getParents($spouse)));
-			?>
+        foreach ($family->getSpouses() as $spouse) {
+            $menu = new Menu(Functions::getCloseRelationshipName($controller->record, $spouse));
+            $menu->addClass('', 'submenu flyout');
+            $menu->addSubmenu(new Menu($this->getParents($spouse)));
+            ?>
 			<tr>
 				<td class="facts_label">
 					<?php echo $menu->getMenu(); ?>
@@ -145,13 +145,13 @@ 
 				</td>
 			</tr>
 		<?php
-		}
+        }
 
-		foreach ($family->getChildren() as $child) {
-			$menu = new Menu(Functions::getCloseRelationshipName($controller->record, $child));
-			$menu->addClass('', 'submenu flyout');
-			$menu->addSubmenu(new Menu($this->getFamily($child)));
-			?>
+        foreach ($family->getChildren() as $child) {
+            $menu = new Menu(Functions::getCloseRelationshipName($controller->record, $child));
+            $menu->addClass('', 'submenu flyout');
+            $menu->addSubmenu(new Menu($this->getFamily($child)));
+            ?>
 			<tr>
 				<td class="facts_label">
 					<?php echo $menu->getMenu(); ?>
@@ -170,97 +170,97 @@ 
 				</td>
 			</tr>
 		<?php
-		}
-	}
+        }
+    }
 
-	/**
-	 * Format an individual.
-	 *
-	 * @param      $person
-	 * @param bool $showUnknown
-	 *
-	 * @return string
-	 */
-	private function getHTML($person, $showUnknown = false) {
-		if ($person instanceof Individual) {
-			return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName());
-		} elseif ($showUnknown) {
-			return sprintf(self::MSG, I18N::translate('unknown'));
-		} else {
-			return '';
-		}
-	}
+    /**
+     * Format an individual.
+     *
+     * @param      $person
+     * @param bool $showUnknown
+     *
+     * @return string
+     */
+    private function getHTML($person, $showUnknown = false) {
+        if ($person instanceof Individual) {
+            return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName());
+        } elseif ($showUnknown) {
+            return sprintf(self::MSG, I18N::translate('unknown'));
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Forat the parents of an individual.
-	 *
-	 * @param Individual $person
-	 *
-	 * @return string
-	 */
-	private function getParents(Individual $person) {
-		$father = null;
-		$mother = null;
-		$html   = sprintf(self::TTL, I18N::translate('Parents'));
-		$family = $person->getPrimaryChildFamily();
-		if ($person->canShowName() && $family !== null) {
-			$father = $family->getHusband();
-			$mother = $family->getWife();
-			$html .= $this->getHTML($father) .
-					 $this->getHTML($mother);
+    /**
+     * Forat the parents of an individual.
+     *
+     * @param Individual $person
+     *
+     * @return string
+     */
+    private function getParents(Individual $person) {
+        $father = null;
+        $mother = null;
+        $html   = sprintf(self::TTL, I18N::translate('Parents'));
+        $family = $person->getPrimaryChildFamily();
+        if ($person->canShowName() && $family !== null) {
+            $father = $family->getHusband();
+            $mother = $family->getWife();
+            $html .= $this->getHTML($father) .
+                        $this->getHTML($mother);
 
-			// Can only have a step parent if one & only one parent found at this point
-			if ($father instanceof Individual xor $mother instanceof Individual) {
-				$stepParents = '';
-				foreach ($person->getChildStepFamilies() as $family) {
-					if (!$father instanceof Individual) {
-						$stepParents .= $this->getHTML($family->getHusband());
-					} else {
-						$stepParents .= $this->getHTML($family->getWife());
-					}
-				}
-				if ($stepParents) {
-					$relationship = $father instanceof Individual ?
-						I18N::translateContext("father’s wife", "step-mother") : I18N::translateContext("mother’s husband", "step-father");
-					$html .= sprintf(self::TTL, $relationship) . $stepParents;
-				}
-			}
-		}
-		if (!($father instanceof Individual || $mother instanceof Individual)) {
-			$html .= sprintf(self::MSG, I18N::translateContext('unknown family', 'unknown'));
-		}
+            // Can only have a step parent if one & only one parent found at this point
+            if ($father instanceof Individual xor $mother instanceof Individual) {
+                $stepParents = '';
+                foreach ($person->getChildStepFamilies() as $family) {
+                    if (!$father instanceof Individual) {
+                        $stepParents .= $this->getHTML($family->getHusband());
+                    } else {
+                        $stepParents .= $this->getHTML($family->getWife());
+                    }
+                }
+                if ($stepParents) {
+                    $relationship = $father instanceof Individual ?
+                        I18N::translateContext("father’s wife", "step-mother") : I18N::translateContext("mother’s husband", "step-father");
+                    $html .= sprintf(self::TTL, $relationship) . $stepParents;
+                }
+            }
+        }
+        if (!($father instanceof Individual || $mother instanceof Individual)) {
+            $html .= sprintf(self::MSG, I18N::translateContext('unknown family', 'unknown'));
+        }
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Format a family.
-	 *
-	 * @param Individual $person
-	 *
-	 * @return string
-	 */
-	private function getFamily(Individual $person) {
-		$html = '';
-		if ($person->canShowName()) {
-			foreach ($person->getSpouseFamilies() as $family) {
-				$spouse = $family->getSpouse($person);
-				$html .= $this->getHTML($spouse, true);
-				$children = $family->getChildren();
-				if (count($children) > 0) {
-					$html .= "<ul class='clist'>";
-					foreach ($children as $child) {
-						$html .= '<li>' . $this->getHTML($child) . '</li>';
-					}
-					$html .= '</ul>';
-				}
-			}
-		}
-		if (!$html) {
-			$html = sprintf(self::MSG, I18N::translate('none'));
-		}
+    /**
+     * Format a family.
+     *
+     * @param Individual $person
+     *
+     * @return string
+     */
+    private function getFamily(Individual $person) {
+        $html = '';
+        if ($person->canShowName()) {
+            foreach ($person->getSpouseFamilies() as $family) {
+                $spouse = $family->getSpouse($person);
+                $html .= $this->getHTML($spouse, true);
+                $children = $family->getChildren();
+                if (count($children) > 0) {
+                    $html .= "<ul class='clist'>";
+                    foreach ($children as $child) {
+                        $html .= '<li>' . $this->getHTML($child) . '</li>';
+                    }
+                    $html .= '</ul>';
+                }
+            }
+        }
+        if (!$html) {
+            $html = sprintf(self::MSG, I18N::translate('none'));
+        }
 
-		return sprintf(self::TTL, I18N::translate('Family')) . $html;
-	}
+        return sprintf(self::TTL, I18N::translate('Family')) . $html;
+    }
 
 }

Braces +32 added lines, -15 removed lines

@@ -24,33 +24,39 @@ 
 /**
  * Class FamilyNavigatorModule
  */
-class FamilyNavigatorModule extends AbstractModule implements ModuleSidebarInterface {
+class FamilyNavigatorModule extends AbstractModule implements ModuleSidebarInterface
+{
 	const TTL = "<div class='flyout2'>%s</div>";
 	const LNK = "<div class='flyout3' data-href='%s'>%s</div>";
 	const MSG = "<div class='flyout4'>(%s)</div>"; // class flyout4 not used in standard themes
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/sidebar */ I18N::translate('Family navigator');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Family navigator” module */ I18N::translate('A sidebar showing an individual’s close families and relatives.');
 	}
 
 	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
+	public function defaultSidebarOrder()
+	{
 		return 20;
 	}
 
 	/** {@inheritdoc} */
-	public function hasSidebarContent() {
+	public function hasSidebarContent()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
+	public function getSidebarAjaxContent()
+	{
 		return '';
 	}
 
@@ -59,7 +65,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSidebarContent() {
+	public function getSidebarContent()
+	{
 		global $controller;
 
 		$controller->addInlineJavascript('
@@ -110,7 +117,8 @@ 
 	 * @param Family $family
 	 * @param string $title
 	 */
-	private function drawFamily(Family $family, $title) {
+	private function drawFamily(Family $family, $title)
+	{
 		global $controller;
 
 		?>
@@ -139,8 +147,11 @@ 
 					<div class="font9">
 						<?php echo $spouse->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $spouse->getFullName(); ?>
+					<?php else {
+    : ?>
+						<?php echo $spouse->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>
@@ -164,8 +175,11 @@ 
 					<div class="font9">
 						<?php echo $child->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $child->getFullName(); ?>
+					<?php else {
+    : ?>
+						<?php echo $child->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>
@@ -181,7 +195,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getHTML($person, $showUnknown = false) {
+	private function getHTML($person, $showUnknown = false)
+	{
 		if ($person instanceof Individual) {
 			return sprintf(self::LNK, $person->getHtmlUrl(), $person->getFullName());
 		} elseif ($showUnknown) {
@@ -198,7 +213,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getParents(Individual $person) {
+	private function getParents(Individual $person)
+	{
 		$father = null;
 		$mother = null;
 		$html   = sprintf(self::TTL, I18N::translate('Parents'));
@@ -240,7 +256,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getFamily(Individual $person) {
+	private function getFamily(Individual $person)
+	{
 		$html = '';
 		if ($person->canShowName()) {
 			foreach ($person->getSpouseFamilies() as $family) {

app/Module/BirthReportModule.php

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
  * Class BirthReportModule
  */
 class BirthReportModule 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('Births');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a module/report */ I18N::translate('Births');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Births” module */ I18N::translate('A report of individuals who were born 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 “Births” module */ I18N::translate('A report of individuals who were born 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 BirthReportModule
  */
-class BirthReportModule extends AbstractModule implements ModuleReportInterface {
+class BirthReportModule 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('Births');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Births” module */ I18N::translate('A report of individuals who were born 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/CkeditorModule.php

Indentation +33 added lines, -33 removed lines

@@ -22,42 +22,42 @@
  * Class CkeditorModule
  */
 class CkeditorModule extends AbstractModule {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module. CKEditor is a trademark. Do not translate it? http://ckeditor.com */ I18N::translate('CKEditor™');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module. CKEditor is a trademark. Do not translate it? http://ckeditor.com */ I18N::translate('CKEditor™');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “CKEditor” module. WYSIWYG = “what you see is what you get” */ I18N::translate('Allow other modules to edit text using a “WYSIWYG” editor, instead of using HTML codes.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “CKEditor” module. WYSIWYG = “what you see is what you get” */ I18N::translate('Allow other modules to edit text using a “WYSIWYG” editor, instead of using HTML codes.');
+    }
 
-	/**
-	 * Convert <textarea class="html-edit"> fields to CKEditor fields
-	 *
-	 * This function needs to be called *after* we have sent the page header and
-	 * before we have sent the page footer.
-	 *
-	 * @param BaseController $controller
-	 */
-	public static function enableEditor($controller) {
-		$controller
-			->addExternalJavascript(WT_CKEDITOR_BASE_URL . 'ckeditor.js')
-			->addExternalJavascript(WT_CKEDITOR_BASE_URL . 'adapters/jquery.js')
-			// Need to specify the path before we load the libary
-			->addInlineJavascript(
-				'var CKEDITOR_BASEPATH="' . WT_CKEDITOR_BASE_URL . '";',
-				BaseController::JS_PRIORITY_HIGH
-			)
-			// Enable for all browsers
-			->addInlineJavascript('CKEDITOR.env.isCompatible = true;')
-			// Disable toolbars
-			->addInlineJavascript('CKEDITOR.config.removePlugins = "forms,newpage,preview,print,save,templates";')
-			->addInlineJavascript('CKEDITOR.config.extraAllowedContent = 
+    /**
+     * Convert <textarea class="html-edit"> fields to CKEditor fields
+     *
+     * This function needs to be called *after* we have sent the page header and
+     * before we have sent the page footer.
+     *
+     * @param BaseController $controller
+     */
+    public static function enableEditor($controller) {
+        $controller
+            ->addExternalJavascript(WT_CKEDITOR_BASE_URL . 'ckeditor.js')
+            ->addExternalJavascript(WT_CKEDITOR_BASE_URL . 'adapters/jquery.js')
+            // Need to specify the path before we load the libary
+            ->addInlineJavascript(
+                'var CKEDITOR_BASEPATH="' . WT_CKEDITOR_BASE_URL . '";',
+                BaseController::JS_PRIORITY_HIGH
+            )
+            // Enable for all browsers
+            ->addInlineJavascript('CKEDITOR.env.isCompatible = true;')
+            // Disable toolbars
+            ->addInlineJavascript('CKEDITOR.config.removePlugins = "forms,newpage,preview,print,save,templates";')
+            ->addInlineJavascript('CKEDITOR.config.extraAllowedContent = 
     "area[shape,coords,href,target,alt,title];map[name];img[usemap];*[class,style]";')
-			// Activate the editor
-			->addInlineJavascript('jQuery(".html-edit").ckeditor(function(config){config.removePlugins = "forms";}, {
+            // Activate the editor
+            ->addInlineJavascript('jQuery(".html-edit").ckeditor(function(config){config.removePlugins = "forms";}, {
 				language: "' . strtolower(WT_LOCALE) . '"
 			});');
-	}
+    }
 }

Braces +8 added lines, -4 removed lines

@@ -21,14 +21,17 @@ 
 /**
  * Class CkeditorModule
  */
-class CkeditorModule extends AbstractModule {
+class CkeditorModule extends AbstractModule
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module. CKEditor is a trademark. Do not translate it? http://ckeditor.com */ I18N::translate('CKEditor™');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “CKEditor” module. WYSIWYG = “what you see is what you get” */ I18N::translate('Allow other modules to edit text using a “WYSIWYG” editor, instead of using HTML codes.');
 	}
 
@@ -40,7 +43,8 @@ 
 	 *
 	 * @param BaseController $controller
 	 */
-	public static function enableEditor($controller) {
+	public static function enableEditor($controller)
+	{
 		$controller
 			->addExternalJavascript(WT_CKEDITOR_BASE_URL . 'ckeditor.js')
 			->addExternalJavascript(WT_CKEDITOR_BASE_URL . 'adapters/jquery.js')

app/Module/SiteMapModule.php

Indentation +290 added lines, -290 removed lines

@@ -31,267 +31,267 @@ 
  * Class SiteMapModule
  */
 class SiteMapModule extends AbstractModule implements ModuleConfigInterface {
-	const RECORDS_PER_VOLUME = 500; // Keep sitemap files small, for memory, CPU and max_allowed_packet limits.
-	const CACHE_LIFE         = 1209600; // Two weeks
+    const RECORDS_PER_VOLUME = 500; // Keep sitemap files small, for memory, CPU and max_allowed_packet limits.
+    const CACHE_LIFE         = 1209600; // Two weeks
 
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module - see http://en.wikipedia.org/wiki/Sitemaps */ I18N::translate('Sitemaps');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module - see http://en.wikipedia.org/wiki/Sitemaps */ I18N::translate('Sitemaps');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Sitemaps” module */ I18N::translate('Generate sitemap files for search engines.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Sitemaps” module */ I18N::translate('Generate sitemap files for search engines.');
+    }
 
-	/**
-	 * This is a general purpose hook, allowing modules to respond to routes
-	 * of the form module.php?mod=FOO&mod_action=BAR
-	 *
-	 * @param string $mod_action
-	 */
-	public function modAction($mod_action) {
-		switch ($mod_action) {
-		case 'admin':
-			$this->admin();
-			break;
-		case 'generate':
-			$this->generate(Filter::get('file'));
-			break;
-		default:
-			http_response_code(404);
-		}
-	}
+    /**
+     * This is a general purpose hook, allowing modules to respond to routes
+     * of the form module.php?mod=FOO&mod_action=BAR
+     *
+     * @param string $mod_action
+     */
+    public function modAction($mod_action) {
+        switch ($mod_action) {
+        case 'admin':
+            $this->admin();
+            break;
+        case 'generate':
+            $this->generate(Filter::get('file'));
+            break;
+        default:
+            http_response_code(404);
+        }
+    }
 
-	/**
-	 * Generate an XML file.
-	 *
-	 * @param string $file
-	 */
-	private function generate($file) {
-		if ($file == 'sitemap.xml') {
-			$this->generateIndex();
-		} elseif (preg_match('/^sitemap-(\d+)-([isrmn])-(\d+).xml$/', $file, $match)) {
-			$this->generateFile($match[1], $match[2], $match[3]);
-		} else {
-			http_response_code(404);
-		}
-	}
+    /**
+     * Generate an XML file.
+     *
+     * @param string $file
+     */
+    private function generate($file) {
+        if ($file == 'sitemap.xml') {
+            $this->generateIndex();
+        } elseif (preg_match('/^sitemap-(\d+)-([isrmn])-(\d+).xml$/', $file, $match)) {
+            $this->generateFile($match[1], $match[2], $match[3]);
+        } else {
+            http_response_code(404);
+        }
+    }
 
-	/**
-	 * The index file contains references to all the other files.
-	 * These files are the same for visitors/users/admins.
-	 */
-	private function generateIndex() {
-		// Check the cache
-		$timestamp = $this->getSetting('sitemap.timestamp');
-		if ($timestamp > WT_TIMESTAMP - self::CACHE_LIFE) {
-			$data = $this->getSetting('sitemap.xml');
-		} else {
-			$data    = '';
-			$lastmod = '<lastmod>' . date('Y-m-d') . '</lastmod>';
-			foreach (Tree::getAll() as $tree) {
-				if ($tree->getPreference('include_in_sitemap')) {
-					$n = Database::prepare(
-						"SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id"
-					)->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
-					for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
-						$data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-i-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
-					}
-					$n = Database::prepare(
-						"SELECT COUNT(*) FROM `##sources` WHERE s_file = :tree_id"
-					)->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
-					if ($n) {
-						for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
-							$data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-s-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
-						}
-					}
-					$n = Database::prepare(
-						"SELECT COUNT(*) FROM `##other` WHERE o_file = :tree_id AND o_type = 'REPO'"
-					)->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
-					if ($n) {
-						for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
-							$data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-r-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
-						}
-					}
-					$n = Database::prepare(
-						"SELECT COUNT(*) FROM `##other` WHERE o_file = :tree_id AND o_type = 'NOTE'"
-					)->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
-					if ($n) {
-						for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
-							$data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-n-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
-						}
-					}
-					$n = Database::prepare(
-						"SELECT COUNT(*) FROM `##media` WHERE m_file = :tree_id"
-					)->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
-					if ($n) {
-						for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
-							$data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-m-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
-						}
-					}
-				}
-			}
-			$data = '<' . '?xml version="1.0" encoding="UTF-8" ?' . '>' . PHP_EOL . '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . PHP_EOL . $data . '</sitemapindex>' . PHP_EOL;
-			// Cache this data.
-			$this->setSetting('sitemap.xml', $data);
-			$this->setSetting('sitemap.timestamp', WT_TIMESTAMP);
-		}
-		header('Content-Type: application/xml');
-		header('Content-Length: ' . strlen($data));
-		echo $data;
-	}
+    /**
+     * The index file contains references to all the other files.
+     * These files are the same for visitors/users/admins.
+     */
+    private function generateIndex() {
+        // Check the cache
+        $timestamp = $this->getSetting('sitemap.timestamp');
+        if ($timestamp > WT_TIMESTAMP - self::CACHE_LIFE) {
+            $data = $this->getSetting('sitemap.xml');
+        } else {
+            $data    = '';
+            $lastmod = '<lastmod>' . date('Y-m-d') . '</lastmod>';
+            foreach (Tree::getAll() as $tree) {
+                if ($tree->getPreference('include_in_sitemap')) {
+                    $n = Database::prepare(
+                        "SELECT COUNT(*) FROM `##individuals` WHERE i_file = :tree_id"
+                    )->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
+                    for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
+                        $data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-i-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
+                    }
+                    $n = Database::prepare(
+                        "SELECT COUNT(*) FROM `##sources` WHERE s_file = :tree_id"
+                    )->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
+                    if ($n) {
+                        for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
+                            $data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-s-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
+                        }
+                    }
+                    $n = Database::prepare(
+                        "SELECT COUNT(*) FROM `##other` WHERE o_file = :tree_id AND o_type = 'REPO'"
+                    )->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
+                    if ($n) {
+                        for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
+                            $data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-r-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
+                        }
+                    }
+                    $n = Database::prepare(
+                        "SELECT COUNT(*) FROM `##other` WHERE o_file = :tree_id AND o_type = 'NOTE'"
+                    )->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
+                    if ($n) {
+                        for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
+                            $data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-n-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
+                        }
+                    }
+                    $n = Database::prepare(
+                        "SELECT COUNT(*) FROM `##media` WHERE m_file = :tree_id"
+                    )->execute(array('tree_id' => $tree->getTreeId()))->fetchOne();
+                    if ($n) {
+                        for ($i = 0; $i <= $n / self::RECORDS_PER_VOLUME; ++$i) {
+                            $data .= '<sitemap><loc>' . WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap-' . $tree->getTreeId() . '-m-' . $i . '.xml</loc>' . $lastmod . '</sitemap>' . PHP_EOL;
+                        }
+                    }
+                }
+            }
+            $data = '<' . '?xml version="1.0" encoding="UTF-8" ?' . '>' . PHP_EOL . '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . PHP_EOL . $data . '</sitemapindex>' . PHP_EOL;
+            // Cache this data.
+            $this->setSetting('sitemap.xml', $data);
+            $this->setSetting('sitemap.timestamp', WT_TIMESTAMP);
+        }
+        header('Content-Type: application/xml');
+        header('Content-Length: ' . strlen($data));
+        echo $data;
+    }
 
-	/**
-	 * A separate file for each family tree and each record type.
-	 * These files depend on access levels, so only cache for visitors.
-	 *
-	 * @param int    $ged_id
-	 * @param string $rec_type
-	 * @param string $volume
-	 */
-	private function generateFile($ged_id, $rec_type, $volume) {
-		$tree = Tree::findById($ged_id);
-		// Check the cache
-		$timestamp = $this->getSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.timestamp');
-		if ($timestamp > WT_TIMESTAMP - self::CACHE_LIFE && !Auth::check()) {
-			$data = $this->getSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.xml');
-		} else {
-			$data    = '<url><loc>' . WT_BASE_URL . 'index.php?ctype=gedcom&amp;ged=' . $tree->getNameUrl() . '</loc></url>' . PHP_EOL;
-			$records = array();
-			switch ($rec_type) {
-			case 'i':
-				$rows = Database::prepare(
-					"SELECT i_id AS xref, i_gedcom AS gedcom" .
-					" FROM `##individuals`" .
-					" WHERE i_file = :tree_id" .
-					" ORDER BY i_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Individual::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 's':
-				$rows = Database::prepare(
-					"SELECT s_id AS xref, s_gedcom AS gedcom" .
-					" FROM `##sources`" .
-					" WHERE s_file = :tree_id" .
-					" ORDER BY s_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Source::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'r':
-				$rows = Database::prepare(
-					"SELECT o_id AS xref, o_gedcom AS gedcom" .
-					" FROM `##other`" .
-					" WHERE o_file = :tree_id AND o_type = 'REPO'" .
-					" ORDER BY o_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'n':
-				$rows = Database::prepare(
-					"SELECT o_id AS xref, o_gedcom AS gedcom" .
-					" FROM `##other`" .
-					" WHERE o_file = :tree_id AND o_type = 'NOTE'" .
-					" ORDER BY o_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Note::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'm':
-				$rows = Database::prepare(
-					"SELECT m_id AS xref, m_gedcom AS gedcom" .
-					" FROM `##media`" .
-					" WHERE m_file = :tree_id" .
-					" ORDER BY m_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Media::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			}
-			foreach ($records as $record) {
-				if ($record->canShowName()) {
-					$data .= '<url>';
-					$data .= '<loc>' . WT_BASE_URL . $record->getHtmlUrl() . '</loc>';
-					$chan = $record->getFirstFact('CHAN');
-					if ($chan) {
-						$date = $chan->getDate();
-						if ($date->isOK()) {
-							$data .= '<lastmod>' . $date->minimumDate()->Format('%Y-%m-%d') . '</lastmod>';
-						}
-					}
-					$data .= '</url>' . PHP_EOL;
-				}
-			}
-			$data = '<' . '?xml version="1.0" encoding="UTF-8" ?' . '>' . PHP_EOL . '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">' . PHP_EOL . $data . '</urlset>' . PHP_EOL;
-			// Cache this data - but only for visitors, as we don’t want
-			// visitors to see data created by signed-in users.
-			if (!Auth::check()) {
-				$this->setSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.xml', $data);
-				$this->setSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.timestamp', WT_TIMESTAMP);
-			}
-		}
-		header('Content-Type: application/xml');
-		header('Content-Length: ' . strlen($data));
-		echo $data;
-	}
+    /**
+     * A separate file for each family tree and each record type.
+     * These files depend on access levels, so only cache for visitors.
+     *
+     * @param int    $ged_id
+     * @param string $rec_type
+     * @param string $volume
+     */
+    private function generateFile($ged_id, $rec_type, $volume) {
+        $tree = Tree::findById($ged_id);
+        // Check the cache
+        $timestamp = $this->getSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.timestamp');
+        if ($timestamp > WT_TIMESTAMP - self::CACHE_LIFE && !Auth::check()) {
+            $data = $this->getSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.xml');
+        } else {
+            $data    = '<url><loc>' . WT_BASE_URL . 'index.php?ctype=gedcom&amp;ged=' . $tree->getNameUrl() . '</loc></url>' . PHP_EOL;
+            $records = array();
+            switch ($rec_type) {
+            case 'i':
+                $rows = Database::prepare(
+                    "SELECT i_id AS xref, i_gedcom AS gedcom" .
+                    " FROM `##individuals`" .
+                    " WHERE i_file = :tree_id" .
+                    " ORDER BY i_id" .
+                    " LIMIT :limit OFFSET :offset"
+                )->execute(array(
+                    'tree_id' => $ged_id,
+                    'limit'   => self::RECORDS_PER_VOLUME,
+                    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+                ))->fetchAll();
+                foreach ($rows as $row) {
+                    $records[] = Individual::getInstance($row->xref, $tree, $row->gedcom);
+                }
+                break;
+            case 's':
+                $rows = Database::prepare(
+                    "SELECT s_id AS xref, s_gedcom AS gedcom" .
+                    " FROM `##sources`" .
+                    " WHERE s_file = :tree_id" .
+                    " ORDER BY s_id" .
+                    " LIMIT :limit OFFSET :offset"
+                )->execute(array(
+                    'tree_id' => $ged_id,
+                    'limit'   => self::RECORDS_PER_VOLUME,
+                    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+                ))->fetchAll();
+                foreach ($rows as $row) {
+                    $records[] = Source::getInstance($row->xref, $tree, $row->gedcom);
+                }
+                break;
+            case 'r':
+                $rows = Database::prepare(
+                    "SELECT o_id AS xref, o_gedcom AS gedcom" .
+                    " FROM `##other`" .
+                    " WHERE o_file = :tree_id AND o_type = 'REPO'" .
+                    " ORDER BY o_id" .
+                    " LIMIT :limit OFFSET :offset"
+                )->execute(array(
+                    'tree_id' => $ged_id,
+                    'limit'   => self::RECORDS_PER_VOLUME,
+                    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+                ))->fetchAll();
+                foreach ($rows as $row) {
+                    $records[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
+                }
+                break;
+            case 'n':
+                $rows = Database::prepare(
+                    "SELECT o_id AS xref, o_gedcom AS gedcom" .
+                    " FROM `##other`" .
+                    " WHERE o_file = :tree_id AND o_type = 'NOTE'" .
+                    " ORDER BY o_id" .
+                    " LIMIT :limit OFFSET :offset"
+                )->execute(array(
+                    'tree_id' => $ged_id,
+                    'limit'   => self::RECORDS_PER_VOLUME,
+                    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+                ))->fetchAll();
+                foreach ($rows as $row) {
+                    $records[] = Note::getInstance($row->xref, $tree, $row->gedcom);
+                }
+                break;
+            case 'm':
+                $rows = Database::prepare(
+                    "SELECT m_id AS xref, m_gedcom AS gedcom" .
+                    " FROM `##media`" .
+                    " WHERE m_file = :tree_id" .
+                    " ORDER BY m_id" .
+                    " LIMIT :limit OFFSET :offset"
+                )->execute(array(
+                    'tree_id' => $ged_id,
+                    'limit'   => self::RECORDS_PER_VOLUME,
+                    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+                ))->fetchAll();
+                foreach ($rows as $row) {
+                    $records[] = Media::getInstance($row->xref, $tree, $row->gedcom);
+                }
+                break;
+            }
+            foreach ($records as $record) {
+                if ($record->canShowName()) {
+                    $data .= '<url>';
+                    $data .= '<loc>' . WT_BASE_URL . $record->getHtmlUrl() . '</loc>';
+                    $chan = $record->getFirstFact('CHAN');
+                    if ($chan) {
+                        $date = $chan->getDate();
+                        if ($date->isOK()) {
+                            $data .= '<lastmod>' . $date->minimumDate()->Format('%Y-%m-%d') . '</lastmod>';
+                        }
+                    }
+                    $data .= '</url>' . PHP_EOL;
+                }
+            }
+            $data = '<' . '?xml version="1.0" encoding="UTF-8" ?' . '>' . PHP_EOL . '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">' . PHP_EOL . $data . '</urlset>' . PHP_EOL;
+            // Cache this data - but only for visitors, as we don’t want
+            // visitors to see data created by signed-in users.
+            if (!Auth::check()) {
+                $this->setSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.xml', $data);
+                $this->setSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.timestamp', WT_TIMESTAMP);
+            }
+        }
+        header('Content-Type: application/xml');
+        header('Content-Length: ' . strlen($data));
+        echo $data;
+    }
 
-	/**
-	 * Edit the configuration
-	 */
-	private function admin() {
-		$controller = new PageController;
-		$controller
-			->restrictAccess(Auth::isAdmin())
-			->setPageTitle($this->getTitle())
-			->pageHeader();
+    /**
+     * Edit the configuration
+     */
+    private function admin() {
+        $controller = new PageController;
+        $controller
+            ->restrictAccess(Auth::isAdmin())
+            ->setPageTitle($this->getTitle())
+            ->pageHeader();
 
-		// Save the updated preferences
-		if (Filter::post('action') == 'save') {
-			foreach (Tree::getAll() as $tree) {
-				$tree->setPreference('include_in_sitemap', Filter::postBool('include' . $tree->getTreeId()));
-			}
-			// Clear cache and force files to be regenerated
-			Database::prepare(
-				"DELETE FROM `##module_setting` WHERE setting_name LIKE 'sitemap%'"
-			)->execute();
-		}
+        // Save the updated preferences
+        if (Filter::post('action') == 'save') {
+            foreach (Tree::getAll() as $tree) {
+                $tree->setPreference('include_in_sitemap', Filter::postBool('include' . $tree->getTreeId()));
+            }
+            // Clear cache and force files to be regenerated
+            Database::prepare(
+                "DELETE FROM `##module_setting` WHERE setting_name LIKE 'sitemap%'"
+            )->execute();
+        }
 
-		$include_any = false;
+        $include_any = false;
 
-		?>
+        ?>
 		<ol class="breadcrumb small">
 			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -300,46 +300,46 @@ 
 		<h1><?php echo $controller->getPageTitle(); ?></h1>
 		<?php
 
-		echo
-		'<p>',
-			/* I18N: The www.sitemaps.org site is translated into many languages (e.g. http://www.sitemaps.org/fr/) - choose an appropriate URL. */
-			I18N::translate('Sitemaps are a way for webmasters to tell search engines about the pages on a website that are available for crawling. All major search engines support sitemaps. For more information, see <a href="http://www.sitemaps.org/">www.sitemaps.org</a>.') .
-			'</p>',
-		'<p>', /* I18N: Label for a configuration option */ I18N::translate('Which family trees should be included in the sitemaps'), '</p>',
-			'<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=admin">',
-		'<input type="hidden" name="action" value="save">';
-		foreach (Tree::getAll() as $tree) {
-			echo '<div class="checkbox"><label><input type="checkbox" name="include', $tree->getTreeId(), '" ';
-			if ($tree->getPreference('include_in_sitemap')) {
-				echo 'checked';
-				$include_any = true;
-			}
-			echo '>', $tree->getTitleHtml(), '</label></div>';
-		}
-		echo
-		'<input type="submit" value="', I18N::translate('save'), '">',
-		'</form>',
-		'<hr>';
+        echo
+        '<p>',
+            /* I18N: The www.sitemaps.org site is translated into many languages (e.g. http://www.sitemaps.org/fr/) - choose an appropriate URL. */
+            I18N::translate('Sitemaps are a way for webmasters to tell search engines about the pages on a website that are available for crawling. All major search engines support sitemaps. For more information, see <a href="http://www.sitemaps.org/">www.sitemaps.org</a>.') .
+            '</p>',
+        '<p>', /* I18N: Label for a configuration option */ I18N::translate('Which family trees should be included in the sitemaps'), '</p>',
+            '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=admin">',
+        '<input type="hidden" name="action" value="save">';
+        foreach (Tree::getAll() as $tree) {
+            echo '<div class="checkbox"><label><input type="checkbox" name="include', $tree->getTreeId(), '" ';
+            if ($tree->getPreference('include_in_sitemap')) {
+                echo 'checked';
+                $include_any = true;
+            }
+            echo '>', $tree->getTitleHtml(), '</label></div>';
+        }
+        echo
+        '<input type="submit" value="', I18N::translate('save'), '">',
+        '</form>',
+        '<hr>';
 
-		if ($include_any) {
-			$site_map_url1 = WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap.xml';
-			$site_map_url2 = rawurlencode(WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&mod_action=generate&file=sitemap.xml');
-			echo
-				'<p>', I18N::translate('To tell search engines that sitemaps are available, you should add the following line to your robots.txt file.'), '</p>',
-				'<pre>Sitemap: ', $site_map_url1, '</pre>',
-				'<hr>',
-				'<p>', I18N::translate('To tell search engines that sitemaps are available, you can use the following links.'), '</p>',
-				'<ul>',
-				// This list comes from http://en.wikipedia.org/wiki/Sitemaps
-				'<li><a href="https://www.bing.com/webmaster/ping.aspx?siteMap=' . $site_map_url2 . '">Bing</a></li>',
-				'<li><a href="https://www.google.com/webmasters/tools/ping?sitemap=' . $site_map_url2 . '">Google</a></li>',
-				'</ul>';
+        if ($include_any) {
+            $site_map_url1 = WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&amp;mod_action=generate&amp;file=sitemap.xml';
+            $site_map_url2 = rawurlencode(WT_BASE_URL . 'module.php?mod=' . $this->getName() . '&mod_action=generate&file=sitemap.xml');
+            echo
+                '<p>', I18N::translate('To tell search engines that sitemaps are available, you should add the following line to your robots.txt file.'), '</p>',
+                '<pre>Sitemap: ', $site_map_url1, '</pre>',
+                '<hr>',
+                '<p>', I18N::translate('To tell search engines that sitemaps are available, you can use the following links.'), '</p>',
+                '<ul>',
+                // This list comes from http://en.wikipedia.org/wiki/Sitemaps
+                '<li><a href="https://www.bing.com/webmaster/ping.aspx?siteMap=' . $site_map_url2 . '">Bing</a></li>',
+                '<li><a href="https://www.google.com/webmasters/tools/ping?sitemap=' . $site_map_url2 . '">Google</a></li>',
+                '</ul>';
 
-		}
-	}
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function getConfigLink() {
-		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=admin';
-	}
+    /** {@inheritdoc} */
+    public function getConfigLink() {
+        return 'module.php?mod=' . $this->getName() . '&amp;mod_action=admin';
+    }
 }

Switch Indentation +88 added lines, -88 removed lines

@@ -52,14 +52,14 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin':
-			$this->admin();
-			break;
-		case 'generate':
-			$this->generate(Filter::get('file'));
-			break;
-		default:
-			http_response_code(404);
+		    case 'admin':
+			    $this->admin();
+			    break;
+		    case 'generate':
+			    $this->generate(Filter::get('file'));
+			    break;
+		    default:
+			    http_response_code(404);
 		}
 	}
 
@@ -160,86 +160,86 @@ 
 			$data    = '<url><loc>' . WT_BASE_URL . 'index.php?ctype=gedcom&amp;ged=' . $tree->getNameUrl() . '</loc></url>' . PHP_EOL;
 			$records = array();
 			switch ($rec_type) {
-			case 'i':
-				$rows = Database::prepare(
-					"SELECT i_id AS xref, i_gedcom AS gedcom" .
-					" FROM `##individuals`" .
-					" WHERE i_file = :tree_id" .
-					" ORDER BY i_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Individual::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 's':
-				$rows = Database::prepare(
-					"SELECT s_id AS xref, s_gedcom AS gedcom" .
-					" FROM `##sources`" .
-					" WHERE s_file = :tree_id" .
-					" ORDER BY s_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Source::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'r':
-				$rows = Database::prepare(
-					"SELECT o_id AS xref, o_gedcom AS gedcom" .
-					" FROM `##other`" .
-					" WHERE o_file = :tree_id AND o_type = 'REPO'" .
-					" ORDER BY o_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'n':
-				$rows = Database::prepare(
-					"SELECT o_id AS xref, o_gedcom AS gedcom" .
-					" FROM `##other`" .
-					" WHERE o_file = :tree_id AND o_type = 'NOTE'" .
-					" ORDER BY o_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Note::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
-			case 'm':
-				$rows = Database::prepare(
-					"SELECT m_id AS xref, m_gedcom AS gedcom" .
-					" FROM `##media`" .
-					" WHERE m_file = :tree_id" .
-					" ORDER BY m_id" .
-					" LIMIT :limit OFFSET :offset"
-				)->execute(array(
-					'tree_id' => $ged_id,
-					'limit'   => self::RECORDS_PER_VOLUME,
-					'offset'  => self::RECORDS_PER_VOLUME * $volume,
-				))->fetchAll();
-				foreach ($rows as $row) {
-					$records[] = Media::getInstance($row->xref, $tree, $row->gedcom);
-				}
-				break;
+			    case 'i':
+				    $rows = Database::prepare(
+					    "SELECT i_id AS xref, i_gedcom AS gedcom" .
+					    " FROM `##individuals`" .
+					    " WHERE i_file = :tree_id" .
+					    " ORDER BY i_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Individual::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 's':
+				    $rows = Database::prepare(
+					    "SELECT s_id AS xref, s_gedcom AS gedcom" .
+					    " FROM `##sources`" .
+					    " WHERE s_file = :tree_id" .
+					    " ORDER BY s_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Source::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 'r':
+				    $rows = Database::prepare(
+					    "SELECT o_id AS xref, o_gedcom AS gedcom" .
+					    " FROM `##other`" .
+					    " WHERE o_file = :tree_id AND o_type = 'REPO'" .
+					    " ORDER BY o_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Repository::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 'n':
+				    $rows = Database::prepare(
+					    "SELECT o_id AS xref, o_gedcom AS gedcom" .
+					    " FROM `##other`" .
+					    " WHERE o_file = :tree_id AND o_type = 'NOTE'" .
+					    " ORDER BY o_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Note::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
+			    case 'm':
+				    $rows = Database::prepare(
+					    "SELECT m_id AS xref, m_gedcom AS gedcom" .
+					    " FROM `##media`" .
+					    " WHERE m_file = :tree_id" .
+					    " ORDER BY m_id" .
+					    " LIMIT :limit OFFSET :offset"
+				    )->execute(array(
+					    'tree_id' => $ged_id,
+					    'limit'   => self::RECORDS_PER_VOLUME,
+					    'offset'  => self::RECORDS_PER_VOLUME * $volume,
+				    ))->fetchAll();
+				    foreach ($rows as $row) {
+					    $records[] = Media::getInstance($row->xref, $tree, $row->gedcom);
+				    }
+				    break;
 			}
 			foreach ($records as $record) {
 				if ($record->canShowName()) {

Braces +18 added lines, -9 removed lines

@@ -30,17 +30,20 @@ 
 /**
  * Class SiteMapModule
  */
-class SiteMapModule extends AbstractModule implements ModuleConfigInterface {
+class SiteMapModule extends AbstractModule implements ModuleConfigInterface
+{
 	const RECORDS_PER_VOLUME = 500; // Keep sitemap files small, for memory, CPU and max_allowed_packet limits.
 	const CACHE_LIFE         = 1209600; // Two weeks
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module - see http://en.wikipedia.org/wiki/Sitemaps */ I18N::translate('Sitemaps');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Sitemaps” module */ I18N::translate('Generate sitemap files for search engines.');
 	}
 
@@ -50,7 +53,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'admin':
 			$this->admin();
@@ -68,7 +72,8 @@ 
 	 *
 	 * @param string $file
 	 */
-	private function generate($file) {
+	private function generate($file)
+	{
 		if ($file == 'sitemap.xml') {
 			$this->generateIndex();
 		} elseif (preg_match('/^sitemap-(\d+)-([isrmn])-(\d+).xml$/', $file, $match)) {
@@ -82,7 +87,8 @@ 
 	 * The index file contains references to all the other files.
 	 * These files are the same for visitors/users/admins.
 	 */
-	private function generateIndex() {
+	private function generateIndex()
+	{
 		// Check the cache
 		$timestamp = $this->getSetting('sitemap.timestamp');
 		if ($timestamp > WT_TIMESTAMP - self::CACHE_LIFE) {
@@ -150,7 +156,8 @@ 
 	 * @param string $rec_type
 	 * @param string $volume
 	 */
-	private function generateFile($ged_id, $rec_type, $volume) {
+	private function generateFile($ged_id, $rec_type, $volume)
+	{
 		$tree = Tree::findById($ged_id);
 		// Check the cache
 		$timestamp = $this->getSetting('sitemap-' . $ged_id . '-' . $rec_type . '-' . $volume . '.timestamp');
@@ -271,7 +278,8 @@ 
 	/**
 	 * Edit the configuration
 	 */
-	private function admin() {
+	private function admin()
+	{
 		$controller = new PageController;
 		$controller
 			->restrictAccess(Auth::isAdmin())
@@ -339,7 +347,8 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function getConfigLink() {
+	public function getConfigLink()
+	{
 		return 'module.php?mod=' . $this->getName() . '&mod_action=admin';
 	}
 }

app/Module/FamilyTreeNewsModule.php

Indentation +140 added lines, -140 removed lines

@@ -26,144 +26,144 @@
  * Class FamilyTreeNewsModule
  */
 class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterface {
-	// How to update the database schema for this module
-	const SCHEMA_TARGET_VERSION   = 3;
-	const SCHEMA_SETTING_NAME     = 'NB_SCHEMA_VERSION';
-	const SCHEMA_MIGRATION_PREFIX = '\Fisharebest\Webtrees\Module\FamilyTreeNews\Schema';
-
-	/**
-	 * Create a new module.
-	 *
-	 * @param string $directory Where is this module installed
-	 */
-	public function __construct($directory) {
-		parent::__construct($directory);
-
-		// Create/update the database tables.
-		// NOTE: if we want to set any module-settings, we'll need to move this.
-		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
-	}
-
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('News');
-	}
-
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “News” module */ I18N::translate('Family news and site announcements.');
-	}
-
-	/**
-	 * 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::get('news_id');
-			if ($news_id) {
-				Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
-			}
-			break;
-		}
-
-		$more_news = Filter::getInteger('more_news');
-		$limit     = 5 * (1 + $more_news);
-
-		$articles = Database::prepare(
-			"SELECT news_id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) + :offset AS updated, subject, body FROM `##news` WHERE gedcom_id = :tree_id ORDER BY updated DESC LIMIT :limit"
-		)->execute(array(
-			'offset'  => WT_TIMESTAMP_OFFSET,
-			'tree_id' => $WT_TREE->getTreeId(),
-			'limit'   => $limit,
-		))->fetchAll();
-
-		$count = Database::prepare(
-			"SELECT COUNT(*) FROM `##news` WHERE gedcom_id = :tree_id"
-		)->execute(array(
-			'tree_id' => $WT_TREE->getTreeId(),
-		))->fetchOne();
-
-		$id      = $this->getName() . $block_id;
-		$class   = $this->getName() . '_block';
-		$title   = $this->getTitle();
-		$content = '';
-
-		if (empty($articles)) {
-			$content .= I18N::translate('No news articles have been submitted.');
-		}
-
-		foreach ($articles as $article) {
-			$content .= '<div class="news_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;
-			if (Auth::isManager($WT_TREE)) {
-				$content .= '<hr>';
-				$content .= '<a href="#" onclick="window.open(\'editnews.php?news_id=\'+' . $article->news_id . ', \'_blank\', news_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>';
-		}
-
-		if (Auth::isManager($WT_TREE)) {
-			$content .= '<a href="#" onclick="window.open(\'editnews.php?gedcom_id=' . $WT_TREE->getTreeId() . '\', \'_blank\', news_window_specs); return false;">' . I18N::translate('Add a news article') . '</a>';
-		}
-
-		if ($count > $limit) {
-			if (Auth::isManager($WT_TREE)) {
-				$content .= ' | ';
-			}
-			$content .= '<a href="#" onclick="jQuery(\'#' . $id . '\').load(\'index.php?ctype=gedcom&amp;ged=' . $WT_TREE->getNameUrl() . '&amp;block_id=' . $block_id . '&amp;action=ajax&amp;more_news=' . ($more_news + 1) . '\'); return false;">' . I18N::translate('More news articles') . "</a>";
-		}
-
-		if ($template) {
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-	}
+    // How to update the database schema for this module
+    const SCHEMA_TARGET_VERSION   = 3;
+    const SCHEMA_SETTING_NAME     = 'NB_SCHEMA_VERSION';
+    const SCHEMA_MIGRATION_PREFIX = '\Fisharebest\Webtrees\Module\FamilyTreeNews\Schema';
+
+    /**
+     * Create a new module.
+     *
+     * @param string $directory Where is this module installed
+     */
+    public function __construct($directory) {
+        parent::__construct($directory);
+
+        // Create/update the database tables.
+        // NOTE: if we want to set any module-settings, we'll need to move this.
+        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+    }
+
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('News');
+    }
+
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “News” module */ I18N::translate('Family news and site announcements.');
+    }
+
+    /**
+     * 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::get('news_id');
+            if ($news_id) {
+                Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
+            }
+            break;
+        }
+
+        $more_news = Filter::getInteger('more_news');
+        $limit     = 5 * (1 + $more_news);
+
+        $articles = Database::prepare(
+            "SELECT news_id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) + :offset AS updated, subject, body FROM `##news` WHERE gedcom_id = :tree_id ORDER BY updated DESC LIMIT :limit"
+        )->execute(array(
+            'offset'  => WT_TIMESTAMP_OFFSET,
+            'tree_id' => $WT_TREE->getTreeId(),
+            'limit'   => $limit,
+        ))->fetchAll();
+
+        $count = Database::prepare(
+            "SELECT COUNT(*) FROM `##news` WHERE gedcom_id = :tree_id"
+        )->execute(array(
+            'tree_id' => $WT_TREE->getTreeId(),
+        ))->fetchOne();
+
+        $id      = $this->getName() . $block_id;
+        $class   = $this->getName() . '_block';
+        $title   = $this->getTitle();
+        $content = '';
+
+        if (empty($articles)) {
+            $content .= I18N::translate('No news articles have been submitted.');
+        }
+
+        foreach ($articles as $article) {
+            $content .= '<div class="news_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;
+            if (Auth::isManager($WT_TREE)) {
+                $content .= '<hr>';
+                $content .= '<a href="#" onclick="window.open(\'editnews.php?news_id=\'+' . $article->news_id . ', \'_blank\', news_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>';
+        }
+
+        if (Auth::isManager($WT_TREE)) {
+            $content .= '<a href="#" onclick="window.open(\'editnews.php?gedcom_id=' . $WT_TREE->getTreeId() . '\', \'_blank\', news_window_specs); return false;">' . I18N::translate('Add a news article') . '</a>';
+        }
+
+        if ($count > $limit) {
+            if (Auth::isManager($WT_TREE)) {
+                $content .= ' | ';
+            }
+            $content .= '<a href="#" onclick="jQuery(\'#' . $id . '\').load(\'index.php?ctype=gedcom&amp;ged=' . $WT_TREE->getNameUrl() . '&amp;block_id=' . $block_id . '&amp;action=ajax&amp;more_news=' . ($more_news + 1) . '\'); return false;">' . I18N::translate('More news articles') . "</a>";
+        }
+
+        if ($template) {
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+    }
 }

Switch Indentation +6 added lines, -6 removed lines

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

Braces +18 added lines, -9 removed lines

@@ -25,7 +25,8 @@ 
 /**
  * Class FamilyTreeNewsModule
  */
-class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterface {
+class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterface
+{
 	// How to update the database schema for this module
 	const SCHEMA_TARGET_VERSION   = 3;
 	const SCHEMA_SETTING_NAME     = 'NB_SCHEMA_VERSION';
@@ -36,7 +37,8 @@ 
 	 *
 	 * @param string $directory Where is this module installed
 	 */
-	public function __construct($directory) {
+	public function __construct($directory)
+	{
 		parent::__construct($directory);
 
 		// Create/update the database tables.
@@ -49,7 +51,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('News');
 	}
 
@@ -58,7 +61,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “News” module */ I18N::translate('Family news and site announcements.');
 	}
 
@@ -71,7 +75,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')) {
@@ -145,17 +150,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -164,6 +172,7 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 	}
 }

app/Module/SourcesTabModule.php

Indentation +93 added lines, -93 removed lines

@@ -26,42 +26,42 @@ 
  * Class SourcesTabModule
  */
 class SourcesTabModule extends AbstractModule implements ModuleTabInterface {
-	/** @var Fact[] All facts belonging to this source. */
-	private $facts;
-
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Sources');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Sources” module */ I18N::translate('A tab showing the sources linked to an individual.');
-	}
-
-	/** {@inheritdoc} */
-	public function defaultTabOrder() {
-		return 30;
-	}
-
-	/** {@inheritdoc} */
-	public function hasTabContent() {
-		global $WT_TREE;
-
-		return Auth::isEditor($WT_TREE) || $this->getFactsWithSources();
-	}
-
-	/** {@inheritdoc} */
-	public function isGrayedOut() {
-		return !$this->getFactsWithSources();
-	}
-
-	/** {@inheritdoc} */
-	public function getTabContent() {
-		global $controller;
-
-		ob_start();
-		?>
+    /** @var Fact[] All facts belonging to this source. */
+    private $facts;
+
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Sources');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Sources” module */ I18N::translate('A tab showing the sources linked to an individual.');
+    }
+
+    /** {@inheritdoc} */
+    public function defaultTabOrder() {
+        return 30;
+    }
+
+    /** {@inheritdoc} */
+    public function hasTabContent() {
+        global $WT_TREE;
+
+        return Auth::isEditor($WT_TREE) || $this->getFactsWithSources();
+    }
+
+    /** {@inheritdoc} */
+    public function isGrayedOut() {
+        return !$this->getFactsWithSources();
+    }
+
+    /** {@inheritdoc} */
+    public function getTabContent() {
+        global $controller;
+
+        ob_start();
+        ?>
 		<table class="facts_table">
 			<tr class="noprint">
 				<td colspan="2" class="descriptionbox rela">
@@ -72,20 +72,20 @@ 
 				</td>
 			</tr>
 			<?php
-			foreach ($this->getFactsWithSources() as $fact) {
-				if ($fact->getTag() == 'SOUR') {
-					FunctionsPrintFacts::printMainSources($fact, 1);
-				} else {
-					FunctionsPrintFacts::printMainSources($fact, 2);
-				}
-			}
-			if (!$this->getFactsWithSources()) {
-				echo '<tr><td id="no_tab4" colspan="2" class="facts_value">', I18N::translate('There are no source citations for this individual.'), '</td></tr>';
-			}
-
-			// New Source Link
-			if ($controller->record->canEdit()) {
-				?>
+            foreach ($this->getFactsWithSources() as $fact) {
+                if ($fact->getTag() == 'SOUR') {
+                    FunctionsPrintFacts::printMainSources($fact, 1);
+                } else {
+                    FunctionsPrintFacts::printMainSources($fact, 2);
+                }
+            }
+            if (!$this->getFactsWithSources()) {
+                echo '<tr><td id="no_tab4" colspan="2" class="facts_value">', I18N::translate('There are no source citations for this individual.'), '</td></tr>';
+            }
+
+            // New Source Link
+            if ($controller->record->canEdit()) {
+                ?>
 				<tr class="noprint">
 					<td class="facts_label">
 						<?php echo GedcomTag::getLabel('SOUR'); ?>
@@ -97,53 +97,53 @@ 
 					</td>
 				</tr>
 			<?php
-			}
-			?>
+            }
+            ?>
 		</table>
 		<script>
 			persistent_toggle("show-level-2-sources", ".row_sour2");
 		</script>
 		<?php
 
-		return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
-	}
-
-	/**
-	 * Get all the facts for an individual which contain sources.
-	 *
-	 * @return Fact[]
-	 */
-	private function getFactsWithSources() {
-		global $controller;
-
-		if ($this->facts === null) {
-			$facts = $controller->record->getFacts();
-			foreach ($controller->record->getSpouseFamilies() as $family) {
-				if ($family->canShow()) {
-					foreach ($family->getFacts() as $fact) {
-						$facts[] = $fact;
-					}
-				}
-			}
-			$this->facts = array();
-			foreach ($facts as $fact) {
-				if (preg_match('/(?:^1|\n\d) SOUR/', $fact->getGedcom())) {
-					$this->facts[] = $fact;
-				}
-			}
-			Functions::sortFacts($this->facts);
-		}
-
-		return $this->facts;
-	}
-
-	/** {@inheritdoc} */
-	public function canLoadAjax() {
-		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
-	}
-
-	/** {@inheritdoc} */
-	public function getPreLoadContent() {
-		return '';
-	}
+        return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
+    }
+
+    /**
+     * Get all the facts for an individual which contain sources.
+     *
+     * @return Fact[]
+     */
+    private function getFactsWithSources() {
+        global $controller;
+
+        if ($this->facts === null) {
+            $facts = $controller->record->getFacts();
+            foreach ($controller->record->getSpouseFamilies() as $family) {
+                if ($family->canShow()) {
+                    foreach ($family->getFacts() as $fact) {
+                        $facts[] = $fact;
+                    }
+                }
+            }
+            $this->facts = array();
+            foreach ($facts as $fact) {
+                if (preg_match('/(?:^1|\n\d) SOUR/', $fact->getGedcom())) {
+                    $this->facts[] = $fact;
+                }
+            }
+            Functions::sortFacts($this->facts);
+        }
+
+        return $this->facts;
+    }
+
+    /** {@inheritdoc} */
+    public function canLoadAjax() {
+        return !Auth::isSearchEngine(); // Search engines cannot use AJAX
+    }
+
+    /** {@inheritdoc} */
+    public function getPreLoadContent() {
+        return '';
+    }
 }

Braces +20 added lines, -10 removed lines

@@ -25,39 +25,46 @@ 
 /**
  * Class SourcesTabModule
  */
-class SourcesTabModule extends AbstractModule implements ModuleTabInterface {
+class SourcesTabModule extends AbstractModule implements ModuleTabInterface
+{
 	/** @var Fact[] All facts belonging to this source. */
 	private $facts;
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Sources');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Sources” module */ I18N::translate('A tab showing the sources linked to an individual.');
 	}
 
 	/** {@inheritdoc} */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 30;
 	}
 
 	/** {@inheritdoc} */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		global $WT_TREE;
 
 		return Auth::isEditor($WT_TREE) || $this->getFactsWithSources();
 	}
 
 	/** {@inheritdoc} */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		return !$this->getFactsWithSources();
 	}
 
 	/** {@inheritdoc} */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $controller;
 
 		ob_start();
@@ -113,7 +120,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	private function getFactsWithSources() {
+	private function getFactsWithSources()
+	{
 		global $controller;
 
 		if ($this->facts === null) {
@@ -138,12 +146,14 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
 	}
 
 	/** {@inheritdoc} */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		return '';
 	}
 }

app/Module/FamiliesSidebarModule.php

Indentation +190 added lines, -190 removed lines

@@ -27,75 +27,75 @@ 
  * Class FamiliesSidebarModule
  */
 class FamiliesSidebarModule extends AbstractModule implements ModuleSidebarInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module/sidebar */ I18N::translate('Family list');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module/sidebar */ I18N::translate('Family list');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Families” module */ I18N::translate('A sidebar showing an alphabetic list of all the families in the family tree.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Families” module */ I18N::translate('A sidebar showing an alphabetic list of all the families in the family tree.');
+    }
 
-	/**
-	 * This is a general purpose hook, allowing modules to respond to routes
-	 * of the form module.php?mod=FOO&mod_action=BAR
-	 *
-	 * @param string $mod_action
-	 */
-	public function modAction($mod_action) {
-		switch ($mod_action) {
-		case 'ajax':
-			header('Content-Type: text/html; charset=UTF-8');
-			echo $this->getSidebarAjaxContent();
-			break;
-		default:
-			http_response_code(404);
-			break;
-		}
-	}
+    /**
+     * This is a general purpose hook, allowing modules to respond to routes
+     * of the form module.php?mod=FOO&mod_action=BAR
+     *
+     * @param string $mod_action
+     */
+    public function modAction($mod_action) {
+        switch ($mod_action) {
+        case 'ajax':
+            header('Content-Type: text/html; charset=UTF-8');
+            echo $this->getSidebarAjaxContent();
+            break;
+        default:
+            http_response_code(404);
+            break;
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
-		return 50;
-	}
+    /** {@inheritdoc} */
+    public function defaultSidebarOrder() {
+        return 50;
+    }
 
-	/** {@inheritdoc} */
-	public function hasSidebarContent() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function hasSidebarContent() {
+        return true;
+    }
 
-	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
-		global $WT_TREE;
+    /** {@inheritdoc} */
+    public function getSidebarAjaxContent() {
+        global $WT_TREE;
 
-		$alpha   = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
-		$surname = Filter::get('surname'); // All indis with this surname.
-		$search  = Filter::get('search');
+        $alpha   = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
+        $surname = Filter::get('surname'); // All indis with this surname.
+        $search  = Filter::get('search');
 
-		if ($search) {
-			return $this->search($WT_TREE, $search);
-		} elseif ($alpha == '@' || $alpha == ',' || $surname) {
-			return $this->getSurnameFams($WT_TREE, $alpha, $surname);
-		} elseif ($alpha) {
-			return $this->getAlphaSurnames($WT_TREE, $alpha);
-		} else {
-			return '';
-		}
-	}
+        if ($search) {
+            return $this->search($WT_TREE, $search);
+        } elseif ($alpha == '@' || $alpha == ',' || $surname) {
+            return $this->getSurnameFams($WT_TREE, $alpha, $surname);
+        } elseif ($alpha) {
+            return $this->getAlphaSurnames($WT_TREE, $alpha);
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Load this sidebar synchronously.
-	 *
-	 * @return string
-	 */
-	public function getSidebarContent() {
-		global $controller, $WT_TREE;
+    /**
+     * Load this sidebar synchronously.
+     *
+     * @return string
+     */
+    public function getSidebarContent() {
+        global $controller, $WT_TREE;
 
-		// Fetch a list of the initial letters of all surnames in the database
-		$initials = QueryName::surnameAlpha($WT_TREE, true, false, false);
+        // Fetch a list of the initial letters of all surnames in the database
+        $initials = QueryName::surnameAlpha($WT_TREE, true, false, false);
 
-		$controller->addInlineJavascript('
+        $controller->addInlineJavascript('
 			var famloadedNames = new Array();
 
 			function fsearchQ() {
@@ -146,147 +146,147 @@ 
 			});
 		');
 
-		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="' . I18N::translate('Search') . '"><p>';
-		foreach ($initials as $letter => $count) {
-			switch ($letter) {
-			case '@':
-				$html = I18N::translateContext('Unknown surname', '…');
-				break;
-			case ',':
-				$html = I18N::translate('None');
-				break;
-			case ' ':
-				$html = '&nbsp;';
-				break;
-			default:
-				$html = $letter;
-				break;
-			}
-			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_fam_letter">' . $html . '</a>';
-			$out .= $html . " ";
-		}
+        $out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="' . I18N::translate('Search') . '"><p>';
+        foreach ($initials as $letter => $count) {
+            switch ($letter) {
+            case '@':
+                $html = I18N::translateContext('Unknown surname', '…');
+                break;
+            case ',':
+                $html = I18N::translate('None');
+                break;
+            case ' ':
+                $html = '&nbsp;';
+                break;
+            default:
+                $html = $letter;
+                break;
+            }
+            $html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_fam_letter">' . $html . '</a>';
+            $out .= $html . " ";
+        }
 
-		$out .= '</p>';
-		$out .= '<div id="sb_fam_content">';
-		$out .= '</div></form>';
+        $out .= '</p>';
+        $out .= '<div id="sb_fam_content">';
+        $out .= '</div></form>';
 
-		return $out;
-	}
+        return $out;
+    }
 
-	/**
-	 * Get a list of surname initials.
-	 *
-	 * @param Tree   $tree
-	 * @param string $alpha
-	 *
-	 * @return string
-	 */
-	private function getAlphaSurnames(Tree $tree, $alpha) {
-		$surnames = QueryName::surnames($tree, '', $alpha, true, true);
-		$out      = '<ul>';
-		foreach (array_keys($surnames) as $surname) {
-			$out .= '<li class="sb_fam_surname_li"><a href="#" data-surname="' . Filter::escapeHtml($surname) . '" data-alpha="' . Filter::escapeHtml($alpha) . '" class="sb_fam_surname">' . Filter::escapeHtml($surname) . '</a>';
-			$out .= '<div class="name_tree_div"></div>';
-			$out .= '</li>';
-		}
-		$out .= '</ul>';
+    /**
+     * Get a list of surname initials.
+     *
+     * @param Tree   $tree
+     * @param string $alpha
+     *
+     * @return string
+     */
+    private function getAlphaSurnames(Tree $tree, $alpha) {
+        $surnames = QueryName::surnames($tree, '', $alpha, true, true);
+        $out      = '<ul>';
+        foreach (array_keys($surnames) as $surname) {
+            $out .= '<li class="sb_fam_surname_li"><a href="#" data-surname="' . Filter::escapeHtml($surname) . '" data-alpha="' . Filter::escapeHtml($alpha) . '" class="sb_fam_surname">' . Filter::escapeHtml($surname) . '</a>';
+            $out .= '<div class="name_tree_div"></div>';
+            $out .= '</li>';
+        }
+        $out .= '</ul>';
 
-		return $out;
-	}
+        return $out;
+    }
 
-	/**
-	 * Get a list of surnames.
-	 *
-	 * @param Tree   $tree
-	 * @param string $alpha
-	 * @param string $surname
-	 *
-	 * @return string
-	 */
-	public function getSurnameFams(Tree $tree, $alpha, $surname) {
-		$families = QueryName::families($tree, $surname, $alpha, '', true);
-		$out      = '<ul>';
-		foreach ($families as $family) {
-			if ($family->canShowName()) {
-				$out .= '<li><a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . ' ';
-				if ($family->canShow()) {
-					$marriage_year = $family->getMarriageYear();
-					if ($marriage_year) {
-						$out .= ' (' . $marriage_year . ')';
-					}
-				}
-				$out .= '</a></li>';
-			}
-		}
-		$out .= '</ul>';
+    /**
+     * Get a list of surnames.
+     *
+     * @param Tree   $tree
+     * @param string $alpha
+     * @param string $surname
+     *
+     * @return string
+     */
+    public function getSurnameFams(Tree $tree, $alpha, $surname) {
+        $families = QueryName::families($tree, $surname, $alpha, '', true);
+        $out      = '<ul>';
+        foreach ($families as $family) {
+            if ($family->canShowName()) {
+                $out .= '<li><a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . ' ';
+                if ($family->canShow()) {
+                    $marriage_year = $family->getMarriageYear();
+                    if ($marriage_year) {
+                        $out .= ' (' . $marriage_year . ')';
+                    }
+                }
+                $out .= '</a></li>';
+            }
+        }
+        $out .= '</ul>';
 
-		return $out;
-	}
+        return $out;
+    }
 
-	/**
-	 * Autocomplete search for families.
-	 *
-	 * @param Tree   $tree  Search this tree
-	 * @param string $query Search for this text
-	 *
-	 * @return string
-	 */
-	private function search(Tree $tree, $query) {
-		if (strlen($query) < 2) {
-			return '';
-		}
-		$rows = Database::prepare(
-			"SELECT i_id AS xref" .
-			" FROM `##individuals`, `##name`" .
-			" WHERE (i_id LIKE CONCAT('%', :query_1, '%') OR n_sort LIKE CONCAT('%', :query_2, '%'))" .
-			" AND i_id = n_id AND i_file = n_file AND i_file = :tree_id" .
-			" ORDER BY n_sort COLLATE :collation" .
-			" LIMIT 50"
-		)->execute(array(
-			'query_1'   => $query,
-			'query_2'   => $query,
-			'tree_id'   => $tree->getTreeId(),
-			'collation' => I18N::collation(),
-		))->fetchAll();
+    /**
+     * Autocomplete search for families.
+     *
+     * @param Tree   $tree  Search this tree
+     * @param string $query Search for this text
+     *
+     * @return string
+     */
+    private function search(Tree $tree, $query) {
+        if (strlen($query) < 2) {
+            return '';
+        }
+        $rows = Database::prepare(
+            "SELECT i_id AS xref" .
+            " FROM `##individuals`, `##name`" .
+            " WHERE (i_id LIKE CONCAT('%', :query_1, '%') OR n_sort LIKE CONCAT('%', :query_2, '%'))" .
+            " AND i_id = n_id AND i_file = n_file AND i_file = :tree_id" .
+            " ORDER BY n_sort COLLATE :collation" .
+            " LIMIT 50"
+        )->execute(array(
+            'query_1'   => $query,
+            'query_2'   => $query,
+            'tree_id'   => $tree->getTreeId(),
+            'collation' => I18N::collation(),
+        ))->fetchAll();
 
-		$ids = array();
-		foreach ($rows as $row) {
-			$ids[] = $row->xref;
-		}
+        $ids = array();
+        foreach ($rows as $row) {
+            $ids[] = $row->xref;
+        }
 
-		$vars = array();
-		if (empty($ids)) {
-			//-- no match : search for FAM id
-			$where  = "f_id LIKE CONCAT('%', ?, '%')";
-			$vars[] = $query;
-		} else {
-			//-- search for spouses
-			$qs    = implode(',', array_fill(0, count($ids), '?'));
-			$where = "(f_husb IN ($qs) OR f_wife IN ($qs))";
-			$vars  = array_merge($vars, $ids, $ids);
-		}
+        $vars = array();
+        if (empty($ids)) {
+            //-- no match : search for FAM id
+            $where  = "f_id LIKE CONCAT('%', ?, '%')";
+            $vars[] = $query;
+        } else {
+            //-- search for spouses
+            $qs    = implode(',', array_fill(0, count($ids), '?'));
+            $where = "(f_husb IN ($qs) OR f_wife IN ($qs))";
+            $vars  = array_merge($vars, $ids, $ids);
+        }
 
-		$vars[] = $tree->getTreeId();
-		$rows   = Database::prepare("SELECT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom FROM `##families` WHERE {$where} AND f_file=?")
-		->execute($vars)
-		->fetchAll();
+        $vars[] = $tree->getTreeId();
+        $rows   = Database::prepare("SELECT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom FROM `##families` WHERE {$where} AND f_file=?")
+        ->execute($vars)
+        ->fetchAll();
 
-		$out = '<ul>';
-		foreach ($rows as $row) {
-			$family = Family::getInstance($row->xref, $tree, $row->gedcom);
-			if ($family->canShowName()) {
-				$out .= '<li><a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . ' ';
-				if ($family->canShow()) {
-					$marriage_year = $family->getMarriageYear();
-					if ($marriage_year) {
-						$out .= ' (' . $marriage_year . ')';
-					}
-				}
-				$out .= '</a></li>';
-			}
-		}
-		$out .= '</ul>';
+        $out = '<ul>';
+        foreach ($rows as $row) {
+            $family = Family::getInstance($row->xref, $tree, $row->gedcom);
+            if ($family->canShowName()) {
+                $out .= '<li><a href="' . $family->getHtmlUrl() . '">' . $family->getFullName() . ' ';
+                if ($family->canShow()) {
+                    $marriage_year = $family->getMarriageYear();
+                    if ($marriage_year) {
+                        $out .= ' (' . $marriage_year . ')';
+                    }
+                }
+                $out .= '</a></li>';
+            }
+        }
+        $out .= '</ul>';
 
-		return $out;
-	}
+        return $out;
+    }
 }

Switch Indentation +19 added lines, -19 removed lines

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

Braces +22 added lines, -11 removed lines

@@ -26,14 +26,17 @@ 
 /**
  * Class FamiliesSidebarModule
  */
-class FamiliesSidebarModule extends AbstractModule implements ModuleSidebarInterface {
+class FamiliesSidebarModule extends AbstractModule implements ModuleSidebarInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/sidebar */ I18N::translate('Family list');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Families” module */ I18N::translate('A sidebar showing an alphabetic list of all the families in the family tree.');
 	}
 
@@ -43,7 +46,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'ajax':
 			header('Content-Type: text/html; charset=UTF-8');
@@ -56,17 +60,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
+	public function defaultSidebarOrder()
+	{
 		return 50;
 	}
 
 	/** {@inheritdoc} */
-	public function hasSidebarContent() {
+	public function hasSidebarContent()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
+	public function getSidebarAjaxContent()
+	{
 		global $WT_TREE;
 
 		$alpha   = Filter::get('alpha'); // All surnames beginning with this letter where "@"=unknown and ","=none
@@ -89,7 +96,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSidebarContent() {
+	public function getSidebarContent()
+	{
 		global $controller, $WT_TREE;
 
 		// Fetch a list of the initial letters of all surnames in the database
@@ -181,7 +189,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getAlphaSurnames(Tree $tree, $alpha) {
+	private function getAlphaSurnames(Tree $tree, $alpha)
+	{
 		$surnames = QueryName::surnames($tree, '', $alpha, true, true);
 		$out      = '<ul>';
 		foreach (array_keys($surnames) as $surname) {
@@ -203,7 +212,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSurnameFams(Tree $tree, $alpha, $surname) {
+	public function getSurnameFams(Tree $tree, $alpha, $surname)
+	{
 		$families = QueryName::families($tree, $surname, $alpha, '', true);
 		$out      = '<ul>';
 		foreach ($families as $family) {
@@ -231,7 +241,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function search(Tree $tree, $query) {
+	private function search(Tree $tree, $query)
+	{
 		if (strlen($query) < 2) {
 			return '';
 		}

app/Module/StoriesModule.php

Indentation +301 added lines, -301 removed lines

@@ -31,183 +31,183 @@ 
  * Class StoriesModule
  */
 class StoriesModule extends AbstractModule implements ModuleTabInterface, ModuleConfigInterface, ModuleMenuInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Stories');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Stories” module */ I18N::translate('Add narrative stories to individuals in the family tree.');
-	}
-
-	/**
-	 * This is a general purpose hook, allowing modules to respond to routes
-	 * of the form module.php?mod=FOO&mod_action=BAR
-	 *
-	 * @param string $mod_action
-	 */
-	public function modAction($mod_action) {
-		switch ($mod_action) {
-		case 'admin_edit':
-			$this->edit();
-			break;
-		case 'admin_delete':
-			$this->delete();
-			$this->config();
-			break;
-		case 'admin_config':
-			$this->config();
-			break;
-		case 'show_list':
-			$this->showList();
-			break;
-		default:
-			http_response_code(404);
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function getConfigLink() {
-		return 'module.php?mod=' . $this->getName() . '&mod_action=admin_config';
-	}
-
-	/** {@inheritdoc} */
-	public function defaultTabOrder() {
-		return 55;
-	}
-
-	/** {@inheritdoc} */
-	public function getTabContent() {
-		global $controller, $WT_TREE;
-
-		$block_ids =
-			Database::prepare(
-				"SELECT block_id" .
-				" FROM `##block`" .
-				" WHERE module_name=?" .
-				" AND xref=?" .
-				" AND gedcom_id=?"
-			)->execute(array(
-				$this->getName(),
-				$controller->record->getXref(),
-				$controller->record->getTree()->getTreeId(),
-			))->fetchOneColumn();
-
-		$html = '';
-		foreach ($block_ids as $block_id) {
-			// Only show this block for certain languages
-			$languages = $this->getBlockSetting($block_id, 'languages');
-			if (!$languages || in_array(WT_LOCALE, explode(',', $languages))) {
-				$html .= '<div class="story_title descriptionbox center rela">' . $this->getBlockSetting($block_id, 'title') . '</div>';
-				$html .= '<div class="story_body optionbox">' . $this->getBlockSetting($block_id, 'story_body') . '</div>';
-				if (Auth::isEditor($WT_TREE)) {
-					$html .= '<div class="story_edit"><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=admin_edit&amp;block_id=' . $block_id . '">';
-					$html .= I18N::translate('Edit the story') . '</a></div>';
-				}
-			}
-		}
-		if (Auth::isManager($WT_TREE) && !$html) {
-			$html .= '<div class="news_title center">' . $this->getTitle() . '</div>';
-			$html .= '<div><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=admin_edit&amp;xref=' . $controller->record->getXref() . '">';
-			$html .= I18N::translate('Add a story') . '</a></div><br>';
-		}
-
-		return $html;
-	}
-
-	/** {@inheritdoc} */
-	public function hasTabContent() {
-		return $this->getTabContent() != '';
-	}
-
-	/** {@inheritdoc} */
-	public function isGrayedOut() {
-		global $controller;
-
-		$count_of_stories =
-			Database::prepare(
-				"SELECT COUNT(block_id)" .
-				" FROM `##block`" .
-				" WHERE module_name=?" .
-				" AND xref=?" .
-				" AND gedcom_id=?"
-			)->execute(array(
-				$this->getName(),
-				$controller->record->getXref(),
-				$controller->record->getTree()->getTreeId(),
-			))->fetchOne();
-
-		return $count_of_stories == 0;
-	}
-
-	/** {@inheritdoc} */
-	public function canLoadAjax() {
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function getPreLoadContent() {
-		return '';
-	}
-
-	/**
-	 * Show and process a form to edit a story.
-	 */
-	private function edit() {
-		global $WT_TREE;
-
-		if (Auth::isEditor($WT_TREE)) {
-			if (Filter::postBool('save') && Filter::checkCsrf()) {
-				$block_id = Filter::postInteger('block_id');
-				if ($block_id) {
-					Database::prepare(
-						"UPDATE `##block` SET gedcom_id=?, xref=? WHERE block_id=?"
-					)->execute(array(Filter::postInteger('gedcom_id'), Filter::post('xref', WT_REGEX_XREF), $block_id));
-				} else {
-					Database::prepare(
-						"INSERT INTO `##block` (gedcom_id, xref, module_name, block_order) VALUES (?, ?, ?, ?)"
-					)->execute(array(
-						Filter::postInteger('gedcom_id'),
-						Filter::post('xref', WT_REGEX_XREF),
-						$this->getName(),
-						0,
-					));
-					$block_id = Database::getInstance()->lastInsertId();
-				}
-				$this->setBlockSetting($block_id, 'title', Filter::post('title'));
-				$this->setBlockSetting($block_id, 'story_body', Filter::post('story_body'));
-				$languages = Filter::postArray('lang');
-				$this->setBlockSetting($block_id, 'languages', implode(',', $languages));
-				$this->config();
-			} else {
-				$block_id = Filter::getInteger('block_id');
-
-				$controller = new PageController;
-				if ($block_id) {
-					$controller->setPageTitle(I18N::translate('Edit the story'));
-					$title      = $this->getBlockSetting($block_id, 'title');
-					$story_body = $this->getBlockSetting($block_id, 'story_body');
-					$xref       = Database::prepare(
-						"SELECT xref FROM `##block` WHERE block_id=?"
-					)->execute(array($block_id))->fetchOne();
-				} else {
-					$controller->setPageTitle(I18N::translate('Add a story'));
-					$title      = '';
-					$story_body = '';
-					$xref       = Filter::get('xref', WT_REGEX_XREF);
-				}
-				$controller
-					->pageHeader()
-					->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-					->addInlineJavascript('autocomplete();');
-				if (Module::getModuleByName('ckeditor')) {
-					CkeditorModule::enableEditor($controller);
-				}
-
-				$individual = Individual::getInstance($xref, $WT_TREE);
-
-				?>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Stories');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Stories” module */ I18N::translate('Add narrative stories to individuals in the family tree.');
+    }
+
+    /**
+     * This is a general purpose hook, allowing modules to respond to routes
+     * of the form module.php?mod=FOO&mod_action=BAR
+     *
+     * @param string $mod_action
+     */
+    public function modAction($mod_action) {
+        switch ($mod_action) {
+        case 'admin_edit':
+            $this->edit();
+            break;
+        case 'admin_delete':
+            $this->delete();
+            $this->config();
+            break;
+        case 'admin_config':
+            $this->config();
+            break;
+        case 'show_list':
+            $this->showList();
+            break;
+        default:
+            http_response_code(404);
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function getConfigLink() {
+        return 'module.php?mod=' . $this->getName() . '&amp;mod_action=admin_config';
+    }
+
+    /** {@inheritdoc} */
+    public function defaultTabOrder() {
+        return 55;
+    }
+
+    /** {@inheritdoc} */
+    public function getTabContent() {
+        global $controller, $WT_TREE;
+
+        $block_ids =
+            Database::prepare(
+                "SELECT block_id" .
+                " FROM `##block`" .
+                " WHERE module_name=?" .
+                " AND xref=?" .
+                " AND gedcom_id=?"
+            )->execute(array(
+                $this->getName(),
+                $controller->record->getXref(),
+                $controller->record->getTree()->getTreeId(),
+            ))->fetchOneColumn();
+
+        $html = '';
+        foreach ($block_ids as $block_id) {
+            // Only show this block for certain languages
+            $languages = $this->getBlockSetting($block_id, 'languages');
+            if (!$languages || in_array(WT_LOCALE, explode(',', $languages))) {
+                $html .= '<div class="story_title descriptionbox center rela">' . $this->getBlockSetting($block_id, 'title') . '</div>';
+                $html .= '<div class="story_body optionbox">' . $this->getBlockSetting($block_id, 'story_body') . '</div>';
+                if (Auth::isEditor($WT_TREE)) {
+                    $html .= '<div class="story_edit"><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=admin_edit&amp;block_id=' . $block_id . '">';
+                    $html .= I18N::translate('Edit the story') . '</a></div>';
+                }
+            }
+        }
+        if (Auth::isManager($WT_TREE) && !$html) {
+            $html .= '<div class="news_title center">' . $this->getTitle() . '</div>';
+            $html .= '<div><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=admin_edit&amp;xref=' . $controller->record->getXref() . '">';
+            $html .= I18N::translate('Add a story') . '</a></div><br>';
+        }
+
+        return $html;
+    }
+
+    /** {@inheritdoc} */
+    public function hasTabContent() {
+        return $this->getTabContent() != '';
+    }
+
+    /** {@inheritdoc} */
+    public function isGrayedOut() {
+        global $controller;
+
+        $count_of_stories =
+            Database::prepare(
+                "SELECT COUNT(block_id)" .
+                " FROM `##block`" .
+                " WHERE module_name=?" .
+                " AND xref=?" .
+                " AND gedcom_id=?"
+            )->execute(array(
+                $this->getName(),
+                $controller->record->getXref(),
+                $controller->record->getTree()->getTreeId(),
+            ))->fetchOne();
+
+        return $count_of_stories == 0;
+    }
+
+    /** {@inheritdoc} */
+    public function canLoadAjax() {
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function getPreLoadContent() {
+        return '';
+    }
+
+    /**
+     * Show and process a form to edit a story.
+     */
+    private function edit() {
+        global $WT_TREE;
+
+        if (Auth::isEditor($WT_TREE)) {
+            if (Filter::postBool('save') && Filter::checkCsrf()) {
+                $block_id = Filter::postInteger('block_id');
+                if ($block_id) {
+                    Database::prepare(
+                        "UPDATE `##block` SET gedcom_id=?, xref=? WHERE block_id=?"
+                    )->execute(array(Filter::postInteger('gedcom_id'), Filter::post('xref', WT_REGEX_XREF), $block_id));
+                } else {
+                    Database::prepare(
+                        "INSERT INTO `##block` (gedcom_id, xref, module_name, block_order) VALUES (?, ?, ?, ?)"
+                    )->execute(array(
+                        Filter::postInteger('gedcom_id'),
+                        Filter::post('xref', WT_REGEX_XREF),
+                        $this->getName(),
+                        0,
+                    ));
+                    $block_id = Database::getInstance()->lastInsertId();
+                }
+                $this->setBlockSetting($block_id, 'title', Filter::post('title'));
+                $this->setBlockSetting($block_id, 'story_body', Filter::post('story_body'));
+                $languages = Filter::postArray('lang');
+                $this->setBlockSetting($block_id, 'languages', implode(',', $languages));
+                $this->config();
+            } else {
+                $block_id = Filter::getInteger('block_id');
+
+                $controller = new PageController;
+                if ($block_id) {
+                    $controller->setPageTitle(I18N::translate('Edit the story'));
+                    $title      = $this->getBlockSetting($block_id, 'title');
+                    $story_body = $this->getBlockSetting($block_id, 'story_body');
+                    $xref       = Database::prepare(
+                        "SELECT xref FROM `##block` WHERE block_id=?"
+                    )->execute(array($block_id))->fetchOne();
+                } else {
+                    $controller->setPageTitle(I18N::translate('Add a story'));
+                    $title      = '';
+                    $story_body = '';
+                    $xref       = Filter::get('xref', WT_REGEX_XREF);
+                }
+                $controller
+                    ->pageHeader()
+                    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+                    ->addInlineJavascript('autocomplete();');
+                if (Module::getModuleByName('ckeditor')) {
+                    CkeditorModule::enableEditor($controller);
+                }
+
+                $individual = Individual::getInstance($xref, $WT_TREE);
+
+                ?>
 				<ol class="breadcrumb small">
 					<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 					<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -274,48 +274,48 @@ 
 
 				</form>
 				<?php
-			}
-		} else {
-			header('Location: ' . WT_BASE_URL);
-		}
-	}
-
-	/**
-	 * Respond to a request to delete a story.
-	 */
-	private function delete() {
-		global $WT_TREE;
-
-		if (Auth::isEditor($WT_TREE)) {
-			$block_id = Filter::getInteger('block_id');
-
-			Database::prepare(
-				"DELETE FROM `##block_setting` WHERE block_id=?"
-			)->execute(array($block_id));
-
-			Database::prepare(
-				"DELETE FROM `##block` WHERE block_id=?"
-			)->execute(array($block_id));
-		} else {
-			header('Location: ' . WT_BASE_URL);
-			exit;
-		}
-	}
-
-	/**
-	 * The admin view - list, create, edit, delete stories.
-	 */
-	private function config() {
-		global $WT_TREE;
-
-		$controller = new PageController;
-		$controller
-			->restrictAccess(Auth::isAdmin())
-			->setPageTitle($this->getTitle())
-			->pageHeader()
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-			->addInlineJavascript('
+            }
+        } else {
+            header('Location: ' . WT_BASE_URL);
+        }
+    }
+
+    /**
+     * Respond to a request to delete a story.
+     */
+    private function delete() {
+        global $WT_TREE;
+
+        if (Auth::isEditor($WT_TREE)) {
+            $block_id = Filter::getInteger('block_id');
+
+            Database::prepare(
+                "DELETE FROM `##block_setting` WHERE block_id=?"
+            )->execute(array($block_id));
+
+            Database::prepare(
+                "DELETE FROM `##block` WHERE block_id=?"
+            )->execute(array($block_id));
+        } else {
+            header('Location: ' . WT_BASE_URL);
+            exit;
+        }
+    }
+
+    /**
+     * The admin view - list, create, edit, delete stories.
+     */
+    private function config() {
+        global $WT_TREE;
+
+        $controller = new PageController;
+        $controller
+            ->restrictAccess(Auth::isAdmin())
+            ->setPageTitle($this->getTitle())
+            ->pageHeader()
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+            ->addInlineJavascript('
 				jQuery("#story_table").dataTable({
 					' . I18N::datatablesI18N() . ',
 					autoWidth: false,
@@ -334,15 +334,15 @@ 
 				});
 			');
 
-		$stories = Database::prepare(
-			"SELECT block_id, xref" .
-			" FROM `##block` b" .
-			" WHERE module_name=?" .
-			" AND gedcom_id=?" .
-			" ORDER BY xref"
-		)->execute(array($this->getName(), $WT_TREE->getTreeId()))->fetchAll();
+        $stories = Database::prepare(
+            "SELECT block_id, xref" .
+            " FROM `##block` b" .
+            " WHERE module_name=?" .
+            " AND gedcom_id=?" .
+            " ORDER BY xref"
+        )->execute(array($this->getName(), $WT_TREE->getTreeId()))->fetchAll();
 
-		?>
+        ?>
 		<ol class="breadcrumb small">
 			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -411,20 +411,20 @@ 
 			</tbody>
 		</table>
 		<?php
-	}
-
-	/**
-	 * Show the list of stories
-	 */
-	private function showList() {
-		global $controller, $WT_TREE;
-
-		$controller = new PageController;
-		$controller
-			->setPageTitle($this->getTitle())
-			->pageHeader()
-			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-			->addInlineJavascript('
+    }
+
+    /**
+     * Show the list of stories
+     */
+    private function showList() {
+        global $controller, $WT_TREE;
+
+        $controller = new PageController;
+        $controller
+            ->setPageTitle($this->getTitle())
+            ->pageHeader()
+            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+            ->addInlineJavascript('
 				jQuery("#story_table").dataTable({
 					dom: \'<"H"pf<"dt-clear">irl>t<"F"pl>\',
 					' . I18N::datatablesI18N() . ',
@@ -443,68 +443,68 @@ 
 				});
 			');
 
-		$stories = Database::prepare(
-			"SELECT block_id, xref" .
-			" FROM `##block` b" .
-			" WHERE module_name=?" .
-			" AND gedcom_id=?" .
-			" ORDER BY xref"
-		)->execute(array($this->getName(), $WT_TREE->getTreeId()))->fetchAll();
-
-		echo '<h2 class="center">', I18N::translate('Stories'), '</h2>';
-		if (count($stories) > 0) {
-			echo '<table id="story_table" class="width100">';
-			echo '<thead><tr>
+        $stories = Database::prepare(
+            "SELECT block_id, xref" .
+            " FROM `##block` b" .
+            " WHERE module_name=?" .
+            " AND gedcom_id=?" .
+            " ORDER BY xref"
+        )->execute(array($this->getName(), $WT_TREE->getTreeId()))->fetchAll();
+
+        echo '<h2 class="center">', I18N::translate('Stories'), '</h2>';
+        if (count($stories) > 0) {
+            echo '<table id="story_table" class="width100">';
+            echo '<thead><tr>
 				<th>', I18N::translate('Story title'), '</th>
 				<th>', I18N::translate('Individual'), '</th>
 				</tr></thead>
 				<tbody>';
-			foreach ($stories as $story) {
-				$indi        = Individual::getInstance($story->xref, $WT_TREE);
-				$story_title = $this->getBlockSetting($story->block_id, 'title');
-				$languages   = $this->getBlockSetting($story->block_id, 'languages');
-				if (!$languages || in_array(WT_LOCALE, explode(',', $languages))) {
-					if ($indi) {
-						if ($indi->canShow()) {
-							echo '<tr><td><a href="' . $indi->getHtmlUrl() . '#stories">' . $story_title . '</a></td><td><a href="' . $indi->getHtmlUrl() . '#stories">' . $indi->getFullName() . '</a></td></tr>';
-						}
-					} else {
-						echo '<tr><td>', $story_title, '</td><td class="error">', $story->xref, '</td></tr>';
-					}
-				}
-			}
-			echo '</tbody></table>';
-		}
-	}
-
-	/**
-	 * The user can re-order menus. Until they do, they are shown in this order.
-	 *
-	 * @return int
-	 */
-	public function defaultMenuOrder() {
-		return 30;
-	}
-
-	/**
-	 * 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_HIDE;
-	}
-
-	/**
-	 * A menu, to be added to the main application menu.
-	 *
-	 * @return Menu|null
-	 */
-	public function getMenu() {
-		$menu = new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&amp;mod_action=show_list', 'menu-story');
-
-		return $menu;
-	}
+            foreach ($stories as $story) {
+                $indi        = Individual::getInstance($story->xref, $WT_TREE);
+                $story_title = $this->getBlockSetting($story->block_id, 'title');
+                $languages   = $this->getBlockSetting($story->block_id, 'languages');
+                if (!$languages || in_array(WT_LOCALE, explode(',', $languages))) {
+                    if ($indi) {
+                        if ($indi->canShow()) {
+                            echo '<tr><td><a href="' . $indi->getHtmlUrl() . '#stories">' . $story_title . '</a></td><td><a href="' . $indi->getHtmlUrl() . '#stories">' . $indi->getFullName() . '</a></td></tr>';
+                        }
+                    } else {
+                        echo '<tr><td>', $story_title, '</td><td class="error">', $story->xref, '</td></tr>';
+                    }
+                }
+            }
+            echo '</tbody></table>';
+        }
+    }
+
+    /**
+     * The user can re-order menus. Until they do, they are shown in this order.
+     *
+     * @return int
+     */
+    public function defaultMenuOrder() {
+        return 30;
+    }
+
+    /**
+     * 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_HIDE;
+    }
+
+    /**
+     * A menu, to be added to the main application menu.
+     *
+     * @return Menu|null
+     */
+    public function getMenu() {
+        $menu = new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&amp;mod_action=show_list', 'menu-story');
+
+        return $menu;
+    }
 }

Switch Indentation +15 added lines, -15 removed lines

@@ -49,21 +49,21 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_edit':
-			$this->edit();
-			break;
-		case 'admin_delete':
-			$this->delete();
-			$this->config();
-			break;
-		case 'admin_config':
-			$this->config();
-			break;
-		case 'show_list':
-			$this->showList();
-			break;
-		default:
-			http_response_code(404);
+		    case 'admin_edit':
+			    $this->edit();
+			    break;
+		    case 'admin_delete':
+			    $this->delete();
+			    $this->config();
+			    break;
+		    case 'admin_config':
+			    $this->config();
+			    break;
+		    case 'show_list':
+			    $this->showList();
+			    break;
+		    default:
+			    http_response_code(404);
 		}
 	}
 

Braces +39 added lines, -19 removed lines

@@ -32,12 +32,14 @@ 
  */
 class StoriesModule extends AbstractModule implements ModuleTabInterface, ModuleConfigInterface, ModuleMenuInterface {
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Stories');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Stories” module */ I18N::translate('Add narrative stories to individuals in the family tree.');
 	}
 
@@ -47,7 +49,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'admin_edit':
 			$this->edit();
@@ -68,17 +71,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function getConfigLink() {
+	public function getConfigLink()
+	{
 		return 'module.php?mod=' . $this->getName() . '&mod_action=admin_config';
 	}
 
 	/** {@inheritdoc} */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 55;
 	}
 
 	/** {@inheritdoc} */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $controller, $WT_TREE;
 
 		$block_ids =
@@ -117,12 +123,14 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		return $this->getTabContent() != '';
 	}
 
 	/** {@inheritdoc} */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		global $controller;
 
 		$count_of_stories =
@@ -142,19 +150,22 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		return '';
 	}
 
 	/**
 	 * Show and process a form to edit a story.
 	 */
-	private function edit() {
+	private function edit()
+	{
 		global $WT_TREE;
 
 		if (Auth::isEditor($WT_TREE)) {
@@ -283,7 +294,8 @@ 
 	/**
 	 * Respond to a request to delete a story.
 	 */
-	private function delete() {
+	private function delete()
+	{
 		global $WT_TREE;
 
 		if (Auth::isEditor($WT_TREE)) {
@@ -305,7 +317,8 @@ 
 	/**
 	 * The admin view - list, create, edit, delete stories.
 	 */
-	private function config() {
+	private function config()
+	{
 		global $WT_TREE;
 
 		$controller = new PageController;
@@ -389,8 +402,11 @@ 
 						<a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
 							<?php echo $individual->getFullName(); ?>
 						</a>
-						<?php else: ?>
-							<?php echo $story->xref; ?>
+						<?php else {
+    : ?>
+							<?php echo $story->xref;
+}
+?>
 						<?php endif; ?>
 						</td>
 						<td>
@@ -416,7 +432,8 @@ 
 	/**
 	 * Show the list of stories
 	 */
-	private function showList() {
+	private function showList()
+	{
 		global $controller, $WT_TREE;
 
 		$controller = new PageController;
@@ -482,7 +499,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultMenuOrder() {
+	public function defaultMenuOrder()
+	{
 		return 30;
 	}
 
@@ -493,7 +511,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_HIDE;
 	}
 
@@ -502,7 +521,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getMenu() {
+	public function getMenu()
+	{
 		$menu = new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&amp;mod_action=show_list', 'menu-story');
 
 		return $menu;