fisharebest / webtrees

app/Module/RelativesTabModule.php

Indentation +225 added lines, -225 removed lines

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

Braces +22 added lines, -11 removed lines

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

app/Module/TopPageViewsModule.php

Indentation +140 added lines, -140 removed lines

@@ -27,144 +27,144 @@
  * Class TopPageViewsModule
  */
 class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Most viewed pages');
-	}
-
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “Most visited pages” module */ I18N::translate('A list of the pages that have been viewed the most number of times.');
-	}
-
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		global $ctype, $WT_TREE;
-
-		$num             = $this->getBlockSetting($block_id, 'num', '10');
-		$count_placement = $this->getBlockSetting($block_id, 'count_placement', 'before');
-
-		foreach (array('count_placement', 'num') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-		} else {
-			$title = '';
-		}
-		$title .= $this->getTitle();
-
-		$content = '';
-		// load the lines from the file
-		$top10 = Database::prepare(
-			"SELECT page_parameter, page_count" .
-			" FROM `##hit_counter`" .
-			" WHERE gedcom_id = :tree_id AND page_name IN ('individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php')" .
-			" ORDER BY page_count DESC LIMIT :limit"
-		)->execute(array(
-			'tree_id' => $WT_TREE->getTreeId(),
-			'limit'   => (int) $num,
-		))->fetchAssoc();
-
-		$content .= '<table>';
-		foreach ($top10 as $id => $count) {
-			$record = GedcomRecord::getInstance($id, $WT_TREE);
-			if ($record && $record->canShow()) {
-				$content .= '<tr>';
-				if ($count_placement == 'before') {
-					$content .= '<td dir="ltr" style="text-align:right">[' . $count . ']</td>';
-				}
-				$content .= '<td class="name2" ><a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a></td>';
-				if ($count_placement == 'after') {
-					$content .= '<td dir="ltr" style="text-align:right">[' . $count . ']</td>';
-				}
-				$content .= '</tr>';
-			}
-		}
-		$content .= "</table>";
-
-		if ($template) {
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
-
-	/**
-	 * Should this block load asynchronously using AJAX?
-	 *
-	 * Simple blocks are faster in-line, more comples ones
-	 * can be loaded later.
-	 *
-	 * @return bool
-	 */
-	public function loadAjax() {
-		return true;
-	}
-
-	/**
-	 * Can this block be shown on the user’s home page?
-	 *
-	 * @return bool
-	 */
-	public function isUserBlock() {
-		return false;
-	}
-
-	/**
-	 * Can this block be shown on the tree’s home page?
-	 *
-	 * @return bool
-	 */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
-			$this->setBlockSetting($block_id, 'count_placement', Filter::post('count_placement', 'before|after', 'before'));
-		}
-
-		$num             = $this->getBlockSetting($block_id, 'num', '10');
-		$count_placement = $this->getBlockSetting($block_id, 'count_placement', 'before');
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: ... to show in a list */ I18N::translate('Number of pages');
-		echo '</td><td class="optionbox">';
-		echo '<input type="text" name="num" size="2" value="', $num, '">';
-		echo '</td></tr>';
-
-		echo "<tr><td class=\"descriptionbox wrap width33\">";
-		echo /* I18N: Label for a configuration option */ I18N::translate('Show counts before or after name');
-		echo "</td><td class=\"optionbox\">";
-		echo FunctionsEdit::selectEditControl('count_placement', array('before' => I18N::translate('before'), 'after' => I18N::translate('after')), null, $count_placement, '');
-		echo '</td></tr>';
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Most viewed pages');
+    }
+
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “Most visited pages” module */ I18N::translate('A list of the pages that have been viewed the most number of times.');
+    }
+
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        global $ctype, $WT_TREE;
+
+        $num             = $this->getBlockSetting($block_id, 'num', '10');
+        $count_placement = $this->getBlockSetting($block_id, 'count_placement', 'before');
+
+        foreach (array('count_placement', 'num') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+            $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+        } else {
+            $title = '';
+        }
+        $title .= $this->getTitle();
+
+        $content = '';
+        // load the lines from the file
+        $top10 = Database::prepare(
+            "SELECT page_parameter, page_count" .
+            " FROM `##hit_counter`" .
+            " WHERE gedcom_id = :tree_id AND page_name IN ('individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php')" .
+            " ORDER BY page_count DESC LIMIT :limit"
+        )->execute(array(
+            'tree_id' => $WT_TREE->getTreeId(),
+            'limit'   => (int) $num,
+        ))->fetchAssoc();
+
+        $content .= '<table>';
+        foreach ($top10 as $id => $count) {
+            $record = GedcomRecord::getInstance($id, $WT_TREE);
+            if ($record && $record->canShow()) {
+                $content .= '<tr>';
+                if ($count_placement == 'before') {
+                    $content .= '<td dir="ltr" style="text-align:right">[' . $count . ']</td>';
+                }
+                $content .= '<td class="name2" ><a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a></td>';
+                if ($count_placement == 'after') {
+                    $content .= '<td dir="ltr" style="text-align:right">[' . $count . ']</td>';
+                }
+                $content .= '</tr>';
+            }
+        }
+        $content .= "</table>";
+
+        if ($template) {
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
+
+    /**
+     * Should this block load asynchronously using AJAX?
+     *
+     * Simple blocks are faster in-line, more comples ones
+     * can be loaded later.
+     *
+     * @return bool
+     */
+    public function loadAjax() {
+        return true;
+    }
+
+    /**
+     * Can this block be shown on the user’s home page?
+     *
+     * @return bool
+     */
+    public function isUserBlock() {
+        return false;
+    }
+
+    /**
+     * Can this block be shown on the tree’s home page?
+     *
+     * @return bool
+     */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
+            $this->setBlockSetting($block_id, 'count_placement', Filter::post('count_placement', 'before|after', 'before'));
+        }
+
+        $num             = $this->getBlockSetting($block_id, 'num', '10');
+        $count_placement = $this->getBlockSetting($block_id, 'count_placement', 'before');
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: ... to show in a list */ I18N::translate('Number of pages');
+        echo '</td><td class="optionbox">';
+        echo '<input type="text" name="num" size="2" value="', $num, '">';
+        echo '</td></tr>';
+
+        echo "<tr><td class=\"descriptionbox wrap width33\">";
+        echo /* I18N: Label for a configuration option */ I18N::translate('Show counts before or after name');
+        echo "</td><td class=\"optionbox\">";
+        echo FunctionsEdit::selectEditControl('count_placement', array('before' => I18N::translate('before'), 'after' => I18N::translate('after')), null, $count_placement, '');
+        echo '</td></tr>';
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -26,13 +26,15 @@ 
 /**
  * Class TopPageViewsModule
  */
-class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface {
+class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Most viewed pages');
 	}
 
@@ -41,7 +43,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Most visited pages” module */ I18N::translate('A list of the pages that have been viewed the most number of times.');
 	}
 
@@ -54,7 +57,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $ctype, $WT_TREE;
 
 		$num             = $this->getBlockSetting($block_id, 'num', '10');
@@ -119,7 +123,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return true;
 	}
 
@@ -128,7 +133,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return false;
 	}
 
@@ -137,7 +143,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -146,7 +153,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'num', Filter::postInteger('num', 1, 10000, 10));
 			$this->setBlockSetting($block_id, 'count_placement', Filter::post('count_placement', 'before|after', 'before'));

app/Module/ModuleChartInterface.php

Indentation +12 added lines, -12 removed lines

@@ -22,17 +22,17 @@
  * Interface ModuleChartInterface - Classes and libraries for module system
  */
 interface ModuleChartInterface {
-	/**
-	 * Return a menu item for this chart.
-	 *
-	 * @return Menu|null
-	 */
-	public function getChartMenu(Individual $individual);
+    /**
+     * Return a menu item for this chart.
+     *
+     * @return Menu|null
+     */
+    public function getChartMenu(Individual $individual);
 
-	/**
-	 * Return a menu item for this chart (for menu in individual box).
-	 *
-	 * @return Menu|null
-	 */
-	public function getBoxChartMenu(Individual $individual);
+    /**
+     * Return a menu item for this chart (for menu in individual box).
+     *
+     * @return Menu|null
+     */
+    public function getBoxChartMenu(Individual $individual);
 }

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 /**
  * Interface ModuleChartInterface - Classes and libraries for module system
  */
-interface ModuleChartInterface {
+interface ModuleChartInterface
+{
 	/**
 	 * Return a menu item for this chart.
 	 *

app/Module/FamilyBookChartModule.php

Indentation +47 added lines, -47 removed lines

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

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class FamilyBookChartModule
  */
-class FamilyBookChartModule extends AbstractModule implements ModuleChartInterface {
+class FamilyBookChartModule extends AbstractModule implements ModuleChartInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Family book');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “FamilyBookChart” module */ I18N::translate('A chart of an individual’s ancestors and descendants, as a family book.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -58,7 +62,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'familybook.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 }

app/Module/ReviewChangesModule.php

Indentation +156 added lines, -156 removed lines

@@ -32,148 +32,148 @@ 
  * Class ReviewChangesModule
  */
 class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Pending changes');
-	}
-
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Pending changes” module */ I18N::translate('A list of changes that need to be reviewed by a moderator, and email notifications.');
-	}
-
-	/**
-	 * 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;
-
-		$sendmail = $this->getBlockSetting($block_id, 'sendmail', '1');
-		$days     = $this->getBlockSetting($block_id, 'days', '1');
-		$block    = $this->getBlockSetting($block_id, 'block', '1');
-
-		foreach (array('days', 'sendmail', 'block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
-
-		$changes = Database::prepare(
-			"SELECT 1" .
-			" FROM `##change`" .
-			" WHERE status='pending'" .
-			" LIMIT 1"
-		)->fetchOne();
-
-		if ($changes === '1' && $sendmail === '1') {
-			// There are pending changes - tell moderators/managers/administrators about them.
-			if (WT_TIMESTAMP - Site::getPreference('LAST_CHANGE_EMAIL') > (60 * 60 * 24 * $days)) {
-				// Which users have pending changes?
-				foreach (User::all() as $user) {
-					if ($user->getPreference('contactmethod') !== 'none') {
-						foreach (Tree::getAll() as $tree) {
-							if ($tree->hasPendingEdit() && Auth::isManager($tree, $user)) {
-								I18N::init($user->getPreference('language'));
-								Mail::systemMessage(
-									$tree,
-									$user,
-									I18N::translate('Pending changes'),
-									I18N::translate('There are pending changes for you to moderate.') .
-									Mail::EOL . Mail::EOL .
-									'<a href="' . WT_BASE_URL . 'index.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'index.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
-								);
-								I18N::init(WT_LOCALE);
-							}
-						}
-					}
-				}
-				Site::setPreference('LAST_CHANGE_EMAIL', WT_TIMESTAMP);
-			}
-		}
-		if (Auth::isEditor($WT_TREE) && $WT_TREE->hasPendingEdit()) {
-			$id    = $this->getName() . $block_id;
-			$class = $this->getName() . '_block';
-			if ($ctype === 'user' || Auth::isManager($WT_TREE)) {
-				$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-			} else {
-				$title = '';
-			}
-			$title .= $this->getTitle();
-
-			$content = '';
-			if (Auth::isModerator($WT_TREE)) {
-				$content .= "<a href=\"#\" onclick=\"window.open('edit_changes.php','_blank', chan_window_specs); return false;\">" . I18N::translate('There are pending changes for you to moderate.') . "</a><br>";
-			}
-			if ($sendmail === '1') {
-				$content .= I18N::translate('Last email reminder was sent ') . FunctionsDate::formatTimestamp(Site::getPreference('LAST_CHANGE_EMAIL')) . "<br>";
-				$content .= I18N::translate('Next email reminder will be sent after ') . FunctionsDate::formatTimestamp(Site::getPreference('LAST_CHANGE_EMAIL') + (60 * 60 * 24 * $days)) . "<br><br>";
-			}
-			$content .= '<ul>';
-			$changes = Database::prepare(
-				"SELECT xref" .
-				" FROM  `##change`" .
-				" WHERE status='pending'" .
-				" AND   gedcom_id=?" .
-				" GROUP BY xref"
-			)->execute(array($WT_TREE->getTreeId()))->fetchAll();
-			foreach ($changes as $change) {
-				$record = GedcomRecord::getInstance($change->xref, $WT_TREE);
-				if ($record->canShow()) {
-					$content .= '<li><a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a></li>';
-				}
-			}
-			$content .= '</ul>';
-
-			if ($template) {
-				if ($block) {
-					$class .= ' small_inner_block';
-				}
-
-				return Theme::theme()->formatBlock($id, $title, $class, $content);
-			} else {
-				return $content;
-			}
-		}
-	}
-
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return false;
-	}
-
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
-
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
-
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'days', Filter::postInteger('num', 1, 180, 1));
-			$this->setBlockSetting($block_id, 'sendmail', Filter::postBool('sendmail'));
-			$this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
-		}
-
-		$sendmail = $this->getBlockSetting($block_id, 'sendmail', '1');
-		$days     = $this->getBlockSetting($block_id, 'days', '1');
-		$block    = $this->getBlockSetting($block_id, 'block', '1');
-
-	?>
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Pending changes');
+    }
+
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Pending changes” module */ I18N::translate('A list of changes that need to be reviewed by a moderator, and email notifications.');
+    }
+
+    /**
+     * 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;
+
+        $sendmail = $this->getBlockSetting($block_id, 'sendmail', '1');
+        $days     = $this->getBlockSetting($block_id, 'days', '1');
+        $block    = $this->getBlockSetting($block_id, 'block', '1');
+
+        foreach (array('days', 'sendmail', 'block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
+
+        $changes = Database::prepare(
+            "SELECT 1" .
+            " FROM `##change`" .
+            " WHERE status='pending'" .
+            " LIMIT 1"
+        )->fetchOne();
+
+        if ($changes === '1' && $sendmail === '1') {
+            // There are pending changes - tell moderators/managers/administrators about them.
+            if (WT_TIMESTAMP - Site::getPreference('LAST_CHANGE_EMAIL') > (60 * 60 * 24 * $days)) {
+                // Which users have pending changes?
+                foreach (User::all() as $user) {
+                    if ($user->getPreference('contactmethod') !== 'none') {
+                        foreach (Tree::getAll() as $tree) {
+                            if ($tree->hasPendingEdit() && Auth::isManager($tree, $user)) {
+                                I18N::init($user->getPreference('language'));
+                                Mail::systemMessage(
+                                    $tree,
+                                    $user,
+                                    I18N::translate('Pending changes'),
+                                    I18N::translate('There are pending changes for you to moderate.') .
+                                    Mail::EOL . Mail::EOL .
+                                    '<a href="' . WT_BASE_URL . 'index.php?ged=' . $WT_TREE->getNameUrl() . '">' . WT_BASE_URL . 'index.php?ged=' . $WT_TREE->getNameUrl() . '</a>'
+                                );
+                                I18N::init(WT_LOCALE);
+                            }
+                        }
+                    }
+                }
+                Site::setPreference('LAST_CHANGE_EMAIL', WT_TIMESTAMP);
+            }
+        }
+        if (Auth::isEditor($WT_TREE) && $WT_TREE->hasPendingEdit()) {
+            $id    = $this->getName() . $block_id;
+            $class = $this->getName() . '_block';
+            if ($ctype === 'user' || Auth::isManager($WT_TREE)) {
+                $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+            } else {
+                $title = '';
+            }
+            $title .= $this->getTitle();
+
+            $content = '';
+            if (Auth::isModerator($WT_TREE)) {
+                $content .= "<a href=\"#\" onclick=\"window.open('edit_changes.php','_blank', chan_window_specs); return false;\">" . I18N::translate('There are pending changes for you to moderate.') . "</a><br>";
+            }
+            if ($sendmail === '1') {
+                $content .= I18N::translate('Last email reminder was sent ') . FunctionsDate::formatTimestamp(Site::getPreference('LAST_CHANGE_EMAIL')) . "<br>";
+                $content .= I18N::translate('Next email reminder will be sent after ') . FunctionsDate::formatTimestamp(Site::getPreference('LAST_CHANGE_EMAIL') + (60 * 60 * 24 * $days)) . "<br><br>";
+            }
+            $content .= '<ul>';
+            $changes = Database::prepare(
+                "SELECT xref" .
+                " FROM  `##change`" .
+                " WHERE status='pending'" .
+                " AND   gedcom_id=?" .
+                " GROUP BY xref"
+            )->execute(array($WT_TREE->getTreeId()))->fetchAll();
+            foreach ($changes as $change) {
+                $record = GedcomRecord::getInstance($change->xref, $WT_TREE);
+                if ($record->canShow()) {
+                    $content .= '<li><a href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a></li>';
+                }
+            }
+            $content .= '</ul>';
+
+            if ($template) {
+                if ($block) {
+                    $class .= ' small_inner_block';
+                }
+
+                return Theme::theme()->formatBlock($id, $title, $class, $content);
+            } else {
+                return $content;
+            }
+        }
+    }
+
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return false;
+    }
+
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
+
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
+
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'days', Filter::postInteger('num', 1, 180, 1));
+            $this->setBlockSetting($block_id, 'sendmail', Filter::postBool('sendmail'));
+            $this->setBlockSetting($block_id, 'block', Filter::postBool('block'));
+        }
+
+        $sendmail = $this->getBlockSetting($block_id, 'sendmail', '1');
+        $days     = $this->getBlockSetting($block_id, 'days', '1');
+        $block    = $this->getBlockSetting($block_id, 'block', '1');
+
+    ?>
 	<tr>
 		<td colspan="2">
 			<?php echo I18N::translate('This block will show editors a list of records with pending changes that need to be reviewed by a moderator. It also generates daily emails to moderators whenever pending changes exist.'); ?>
@@ -181,18 +181,18 @@ 
 	</tr>
 
 	<?php
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: Label for a configuration option */ I18N::translate('Send out reminder emails');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('sendmail', $sendmail);
-		echo '<br>';
-		echo I18N::translate('Reminder email frequency (days)') . "&nbsp;<input type='text' name='days' value='" . $days . "' size='2'>";
-		echo '</td></tr>';
-
-		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
-		echo '</td><td class="optionbox">';
-		echo FunctionsEdit::editFieldYesNo('block', $block);
-		echo '</td></tr>';
-	}
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: Label for a configuration option */ I18N::translate('Send out reminder emails');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('sendmail', $sendmail);
+        echo '<br>';
+        echo I18N::translate('Reminder email frequency (days)') . "&nbsp;<input type='text' name='days' value='" . $days . "' size='2'>";
+        echo '</td></tr>';
+
+        echo '<tr><td class="descriptionbox wrap width33">';
+        echo /* I18N: label for a yes/no option */ I18N::translate('Add a scrollbar when block contents grow');
+        echo '</td><td class="optionbox">';
+        echo FunctionsEdit::editFieldYesNo('block', $block);
+        echo '</td></tr>';
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -31,14 +31,17 @@ 
 /**
  * Class ReviewChangesModule
  */
-class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface {
+class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Pending changes');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Pending changes” module */ I18N::translate('A list of changes that need to be reviewed by a moderator, and email notifications.');
 	}
 
@@ -51,7 +54,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;
 
 		$sendmail = $this->getBlockSetting($block_id, 'sendmail', '1');
@@ -143,17 +147,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -162,7 +169,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'days', Filter::postInteger('num', 1, 180, 1));
 			$this->setBlockSetting($block_id, 'sendmail', Filter::postBool('sendmail'));

app/Module/MissingFactsReportModule.php

Indentation +34 added lines, -34 removed lines

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

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class MissingFactsReportModule
  */
-class MissingFactsReportModule extends AbstractModule implements ModuleReportInterface {
+class MissingFactsReportModule 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('Missing data');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Missing data” */ I18N::translate('A report of the information that is missing for an individual and their relatives.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_USER;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $WT_TREE;
 
 		return new Menu(

app/Module/InteractiveTree/TreeView.php

Indentation +327 added lines, -327 removed lines

@@ -24,33 +24,33 @@ 
  * Class TreeView
  */
 class TreeView {
-	/** @var string HTML element name */
-	private $name;
+    /** @var string HTML element name */
+    private $name;
 
-	/** @var string Show all partners */
-	private $all_partners;
+    /** @var string Show all partners */
+    private $all_partners;
 
-	/**
-	 * Treeview Constructor
-	 *
-	 * @param string $name the name of the TreeView object’s instance
-	 */
-	public function __construct($name = 'tree') {
-		$this->name         = $name;
-		$this->all_partners = Filter::cookie('allPartners', 'true|false', 'true');
-	}
+    /**
+     * Treeview Constructor
+     *
+     * @param string $name the name of the TreeView object’s instance
+     */
+    public function __construct($name = 'tree') {
+        $this->name         = $name;
+        $this->all_partners = Filter::cookie('allPartners', 'true|false', 'true');
+    }
 
-	/**
-	 * Draw the viewport which creates the draggable/zoomable framework
-	 * Size is set by the container, as the viewport can scale itself automatically
-	 *
-	 * @param Individual $root_person  the id of the root person
-	 * @param int        $generations number of generations to draw
-	 *
-	 * @return string[]  HTML and Javascript
-	 */
-	public function drawViewport(Individual $root_person, $generations) {
-		$html = '
+    /**
+     * Draw the viewport which creates the draggable/zoomable framework
+     * Size is set by the container, as the viewport can scale itself automatically
+     *
+     * @param Individual $root_person  the id of the root person
+     * @param int        $generations number of generations to draw
+     *
+     * @return string[]  HTML and Javascript
+     */
+    public function drawViewport(Individual $root_person, $generations) {
+        $html = '
 			<a name="tv_content"></a>
 			<div id="' . $this->name . '_out" class="tv_out">
 				<div id="tv_tools" class="noprint">
@@ -73,327 +73,327 @@ 
 			</div>
 		';
 
-		return array($html, 'var ' . $this->name . 'Handler = new TreeViewHandler("' . $this->name . '");');
-	}
+        return array($html, 'var ' . $this->name . 'Handler = new TreeViewHandler("' . $this->name . '");');
+    }
 
-	/**
-	 * Return a JSON structure to a JSON request
-	 *
-	 * @param string $list list of JSON requests
-	 *
-	 * @return string
-	 */
-	public function getPersons($list) {
-		global $WT_TREE;
+    /**
+     * Return a JSON structure to a JSON request
+     *
+     * @param string $list list of JSON requests
+     *
+     * @return string
+     */
+    public function getPersons($list) {
+        global $WT_TREE;
 
-		$list = explode(';', $list);
-		$r    = array();
-		foreach ($list as $jsonRequest) {
-			$firstLetter = substr($jsonRequest, 0, 1);
-			$jsonRequest = substr($jsonRequest, 1);
-			switch ($firstLetter) {
-			case 'c':
-				$fidlist = explode(',', $jsonRequest);
-				$flist   = array();
-				foreach ($fidlist as $fid) {
-					$flist[] = Family::getInstance($fid, $WT_TREE);
-				}
-				$r[] = $this->drawChildren($flist, 1, true);
-				break;
-			case 'p':
-				$params = explode('@', $jsonRequest);
-				$fid    = $params[0];
-				$order  = $params[1];
-				$f      = Family::getInstance($fid, $WT_TREE);
-				if ($f->getHusband()) {
-					$r[] = $this->drawPerson($f->getHusband(), 0, 1, $f, $order);
-				} elseif ($f->getWife()) {
-					$r[] = $this->drawPerson($f->getWife(), 0, 1, $f, $order);
-				}
-				break;
-			}
-		}
+        $list = explode(';', $list);
+        $r    = array();
+        foreach ($list as $jsonRequest) {
+            $firstLetter = substr($jsonRequest, 0, 1);
+            $jsonRequest = substr($jsonRequest, 1);
+            switch ($firstLetter) {
+            case 'c':
+                $fidlist = explode(',', $jsonRequest);
+                $flist   = array();
+                foreach ($fidlist as $fid) {
+                    $flist[] = Family::getInstance($fid, $WT_TREE);
+                }
+                $r[] = $this->drawChildren($flist, 1, true);
+                break;
+            case 'p':
+                $params = explode('@', $jsonRequest);
+                $fid    = $params[0];
+                $order  = $params[1];
+                $f      = Family::getInstance($fid, $WT_TREE);
+                if ($f->getHusband()) {
+                    $r[] = $this->drawPerson($f->getHusband(), 0, 1, $f, $order);
+                } elseif ($f->getWife()) {
+                    $r[] = $this->drawPerson($f->getWife(), 0, 1, $f, $order);
+                }
+                break;
+            }
+        }
 
-		return json_encode($r);
-	}
+        return json_encode($r);
+    }
 
-	/**
-	 * Get the details for a person and their life partner(s)
-	 *
-	 * @param Individual $individual the individual to return the details for
-	 *
-	 * @return string
-	 */
-	public function getDetails(Individual $individual) {
-		$html = $this->getPersonDetails($individual, null);
-		foreach ($individual->getSpouseFamilies() as $family) {
-			$spouse = $family->getSpouse($individual);
-			if ($spouse) {
-				$html .= $this->getPersonDetails($spouse, $family);
-			}
-		}
+    /**
+     * Get the details for a person and their life partner(s)
+     *
+     * @param Individual $individual the individual to return the details for
+     *
+     * @return string
+     */
+    public function getDetails(Individual $individual) {
+        $html = $this->getPersonDetails($individual, null);
+        foreach ($individual->getSpouseFamilies() as $family) {
+            $spouse = $family->getSpouse($individual);
+            if ($spouse) {
+                $html .= $this->getPersonDetails($spouse, $family);
+            }
+        }
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Return the details for a person
-	 *
-	 * @param Individual $individual
-	 * @param Family     $family
-	 *
-	 * @return string
-	 */
-	private function getPersonDetails(Individual $individual, Family $family = null) {
-		$hmtl = $this->getThumbnail($individual);
-		$hmtl .= '<a class="tv_link" href="' . $individual->getHtmlUrl() . '">' . $individual->getFullName() . '</a> <a href="module.php?mod=tree&amp;mod_action=treeview&amp;rootid=' . $individual->getXref() . '" title="' . I18N::translate('Interactive tree of %s', strip_tags($individual->getFullName())) . '" class="icon-button_indi tv_link tv_treelink"></a>';
-		foreach ($individual->getFacts(WT_EVENTS_BIRT, true) as $fact) {
-			$hmtl .= $fact->summary();
-		}
-		if ($family) {
-			foreach ($family->getFacts(WT_EVENTS_MARR, true) as $fact) {
-				$hmtl .= $fact->summary();
-			}
-		}
-		foreach ($individual->getFacts(WT_EVENTS_DEAT, true) as $fact) {
-			$hmtl .= $fact->summary();
-		}
+    /**
+     * Return the details for a person
+     *
+     * @param Individual $individual
+     * @param Family     $family
+     *
+     * @return string
+     */
+    private function getPersonDetails(Individual $individual, Family $family = null) {
+        $hmtl = $this->getThumbnail($individual);
+        $hmtl .= '<a class="tv_link" href="' . $individual->getHtmlUrl() . '">' . $individual->getFullName() . '</a> <a href="module.php?mod=tree&amp;mod_action=treeview&amp;rootid=' . $individual->getXref() . '" title="' . I18N::translate('Interactive tree of %s', strip_tags($individual->getFullName())) . '" class="icon-button_indi tv_link tv_treelink"></a>';
+        foreach ($individual->getFacts(WT_EVENTS_BIRT, true) as $fact) {
+            $hmtl .= $fact->summary();
+        }
+        if ($family) {
+            foreach ($family->getFacts(WT_EVENTS_MARR, true) as $fact) {
+                $hmtl .= $fact->summary();
+            }
+        }
+        foreach ($individual->getFacts(WT_EVENTS_DEAT, true) as $fact) {
+            $hmtl .= $fact->summary();
+        }
 
-		return '<div class="tv' . $individual->getSex() . ' tv_person_expanded">' . $hmtl . '</div>';
-	}
+        return '<div class="tv' . $individual->getSex() . ' tv_person_expanded">' . $hmtl . '</div>';
+    }
 
-	/**
-	 * Draw the children for some families
-	 *
-	 * @param Family[] $familyList array of families to draw the children for
-	 * @param int      $gen        number of generations to draw
-	 * @param bool     $ajax       setted to true for an ajax call
-	 *
-	 * @return string
-	 */
-	private function drawChildren(array $familyList, $gen = 1, $ajax = false) {
-		$html          = '';
-		$children2draw = array();
-		$f2load        = array();
+    /**
+     * Draw the children for some families
+     *
+     * @param Family[] $familyList array of families to draw the children for
+     * @param int      $gen        number of generations to draw
+     * @param bool     $ajax       setted to true for an ajax call
+     *
+     * @return string
+     */
+    private function drawChildren(array $familyList, $gen = 1, $ajax = false) {
+        $html          = '';
+        $children2draw = array();
+        $f2load        = array();
 
-		foreach ($familyList as $f) {
-			if (empty($f)) {
-				continue;
-			}
-			$children = $f->getChildren();
-			if ($children) {
-				$f2load[] = $f->getXref();
-				foreach ($children as $child) {
-					// Eliminate duplicates - e.g. when adopted by a step-parent
-					$children2draw[$child->getXref()] = $child;
-				}
-			}
-		}
-		$tc = count($children2draw);
-		if ($tc) {
-			$f2load = implode(',', $f2load);
-			$nbc    = 0;
-			foreach ($children2draw as $child) {
-				$nbc++;
-				if ($tc == 1) {
-					$co = 'c'; // unique
-				} elseif ($nbc == 1) {
-					$co = 't'; // first
-				} elseif ($nbc == $tc) {
-					$co = 'b'; //last
-				} else {
-					$co = 'h';
-				}
-				$html .= $this->drawPerson($child, $gen - 1, -1, null, $co);
-			}
-			if (!$ajax) {
-				$html = '<td align="right"' . ($gen == 0 ? ' abbr="c' . $f2load . '"' : '') . '>' . $html . '</td>' . $this->drawHorizontalLine();
-			}
-		}
+        foreach ($familyList as $f) {
+            if (empty($f)) {
+                continue;
+            }
+            $children = $f->getChildren();
+            if ($children) {
+                $f2load[] = $f->getXref();
+                foreach ($children as $child) {
+                    // Eliminate duplicates - e.g. when adopted by a step-parent
+                    $children2draw[$child->getXref()] = $child;
+                }
+            }
+        }
+        $tc = count($children2draw);
+        if ($tc) {
+            $f2load = implode(',', $f2load);
+            $nbc    = 0;
+            foreach ($children2draw as $child) {
+                $nbc++;
+                if ($tc == 1) {
+                    $co = 'c'; // unique
+                } elseif ($nbc == 1) {
+                    $co = 't'; // first
+                } elseif ($nbc == $tc) {
+                    $co = 'b'; //last
+                } else {
+                    $co = 'h';
+                }
+                $html .= $this->drawPerson($child, $gen - 1, -1, null, $co);
+            }
+            if (!$ajax) {
+                $html = '<td align="right"' . ($gen == 0 ? ' abbr="c' . $f2load . '"' : '') . '>' . $html . '</td>' . $this->drawHorizontalLine();
+            }
+        }
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Draw a person in the tree
-	 *
-	 * @param Individual $person The Person object to draw the box for
-	 * @param int        $gen    The number of generations up or down to print
-	 * @param int        $state  Whether we are going up or down the tree, -1 for descendents +1 for ancestors
-	 * @param Family     $pfamily
-	 * @param string     $order  first (1), last(2), unique(0), or empty. Required for drawing lines between boxes
-	 * @param bool       $isRoot
-	 *
-	 * @return string
-	 *
-	 * Notes : "spouse" means explicitely married partners. Thus, the word "partner"
-	 * (for "life partner") here fits much better than "spouse" or "mate"
-	 * to translate properly the modern french meaning of "conjoint"
-	 */
-	private function drawPerson(Individual $person, $gen, $state, Family $pfamily = null, $order = null, $isRoot = false) {
-		if ($gen < 0) {
-			return '';
-		}
-		if (!empty($pfamily)) {
-			$partner = $pfamily->getSpouse($person);
-		} else {
-			$partner = $person->getCurrentSpouse();
-		}
-		if ($isRoot) {
-			$html = '<table id="tvTreeBorder" class="tv_tree"><tbody><tr><td id="tv_tree_topleft"></td><td id="tv_tree_top"></td><td id="tv_tree_topright"></td></tr><tr><td id="tv_tree_left"></td><td>';
-		} else {
-			$html = '';
-		}
-		/* height 1% : this hack enable the div auto-dimensioning in td for FF & Chrome */
-		$html .= '<table class="tv_tree"' . ($isRoot ? ' id="tv_tree"' : '') . ' style="height: 1%"><tbody><tr>';
+    /**
+     * Draw a person in the tree
+     *
+     * @param Individual $person The Person object to draw the box for
+     * @param int        $gen    The number of generations up or down to print
+     * @param int        $state  Whether we are going up or down the tree, -1 for descendents +1 for ancestors
+     * @param Family     $pfamily
+     * @param string     $order  first (1), last(2), unique(0), or empty. Required for drawing lines between boxes
+     * @param bool       $isRoot
+     *
+     * @return string
+     *
+     * Notes : "spouse" means explicitely married partners. Thus, the word "partner"
+     * (for "life partner") here fits much better than "spouse" or "mate"
+     * to translate properly the modern french meaning of "conjoint"
+     */
+    private function drawPerson(Individual $person, $gen, $state, Family $pfamily = null, $order = null, $isRoot = false) {
+        if ($gen < 0) {
+            return '';
+        }
+        if (!empty($pfamily)) {
+            $partner = $pfamily->getSpouse($person);
+        } else {
+            $partner = $person->getCurrentSpouse();
+        }
+        if ($isRoot) {
+            $html = '<table id="tvTreeBorder" class="tv_tree"><tbody><tr><td id="tv_tree_topleft"></td><td id="tv_tree_top"></td><td id="tv_tree_topright"></td></tr><tr><td id="tv_tree_left"></td><td>';
+        } else {
+            $html = '';
+        }
+        /* height 1% : this hack enable the div auto-dimensioning in td for FF & Chrome */
+        $html .= '<table class="tv_tree"' . ($isRoot ? ' id="tv_tree"' : '') . ' style="height: 1%"><tbody><tr>';
 
-		if ($state <= 0) {
-			// draw children
-			$html .= $this->drawChildren($person->getSpouseFamilies(), $gen);
-		} else {
-			// draw the parent’s lines
-			$html .= $this->drawVerticalLine($order) . $this->drawHorizontalLine();
-		}
+        if ($state <= 0) {
+            // draw children
+            $html .= $this->drawChildren($person->getSpouseFamilies(), $gen);
+        } else {
+            // draw the parent’s lines
+            $html .= $this->drawVerticalLine($order) . $this->drawHorizontalLine();
+        }
 
-		/* draw the person. Do NOT add person or family id as an id, since a same person could appear more than once in the tree !!! */
-		// Fixing the width for td to the box initial width when the person is the root person fix a rare bug that happen when a person without child and without known parents is the root person : an unwanted white rectangle appear at the right of the person’s boxes, otherwise.
-		$html .= '<td' . ($isRoot ? ' style="width:1px"' : '') . '><div class="tv_box' . ($isRoot ? ' rootPerson' : '') . '" dir="' . I18N::direction() . '" style="text-align: ' . (I18N::direction() === 'rtl' ? 'right' : 'left') . '; direction: ' . I18N::direction() . '" abbr="' . $person->getXref() . '" onclick="' . $this->name . 'Handler.expandBox(this, event);">';
-		$html .= $this->drawPersonName($person);
-		$fop = array(); // $fop is fathers of partners
-		if (!is_null($partner)) {
-			$dashed = '';
-			foreach ($person->getSpouseFamilies() as $family) {
-				$spouse = $family->getSpouse($person);
-				if ($spouse) {
-					if ($spouse === $partner || $this->all_partners === 'true') {
-						$spouse_parents = $spouse->getPrimaryChildFamily();
-						if ($spouse_parents && $spouse_parents->getHusband()) {
-							$fop[] = array($spouse_parents->getHusband(), $spouse_parents);
-						} elseif ($spouse_parents && $spouse_parents->getWife()) {
-							$fop[] = array($spouse_parents->getWife(), $spouse_parents);
-						}
-						$html .= $this->drawPersonName($spouse, $dashed);
-						if ($this->all_partners !== 'true') {
-							break; // we can stop here the foreach loop
-						}
-						$dashed = 'dashed';
-					}
-				}
-			}
-		}
-		$html .= '</div></td>';
+        /* draw the person. Do NOT add person or family id as an id, since a same person could appear more than once in the tree !!! */
+        // Fixing the width for td to the box initial width when the person is the root person fix a rare bug that happen when a person without child and without known parents is the root person : an unwanted white rectangle appear at the right of the person’s boxes, otherwise.
+        $html .= '<td' . ($isRoot ? ' style="width:1px"' : '') . '><div class="tv_box' . ($isRoot ? ' rootPerson' : '') . '" dir="' . I18N::direction() . '" style="text-align: ' . (I18N::direction() === 'rtl' ? 'right' : 'left') . '; direction: ' . I18N::direction() . '" abbr="' . $person->getXref() . '" onclick="' . $this->name . 'Handler.expandBox(this, event);">';
+        $html .= $this->drawPersonName($person);
+        $fop = array(); // $fop is fathers of partners
+        if (!is_null($partner)) {
+            $dashed = '';
+            foreach ($person->getSpouseFamilies() as $family) {
+                $spouse = $family->getSpouse($person);
+                if ($spouse) {
+                    if ($spouse === $partner || $this->all_partners === 'true') {
+                        $spouse_parents = $spouse->getPrimaryChildFamily();
+                        if ($spouse_parents && $spouse_parents->getHusband()) {
+                            $fop[] = array($spouse_parents->getHusband(), $spouse_parents);
+                        } elseif ($spouse_parents && $spouse_parents->getWife()) {
+                            $fop[] = array($spouse_parents->getWife(), $spouse_parents);
+                        }
+                        $html .= $this->drawPersonName($spouse, $dashed);
+                        if ($this->all_partners !== 'true') {
+                            break; // we can stop here the foreach loop
+                        }
+                        $dashed = 'dashed';
+                    }
+                }
+            }
+        }
+        $html .= '</div></td>';
 
-		$primaryChildFamily = $person->getPrimaryChildFamily();
-		if (!empty($primaryChildFamily)) {
-			$parent = $primaryChildFamily->getHusband();
-			if (empty($parent)) {
-				$parent = $primaryChildFamily->getWife();
-			}
-		}
-		if (!empty($parent) || count($fop) || ($state < 0)) {
-			$html .= $this->drawHorizontalLine();
-		}
-		/* draw the parents */
-		if ($state >= 0 && (!empty($parent) || count($fop))) {
-			$unique = (empty($parent) || count($fop) == 0);
-			$html .= '<td align="left"><table class="tv_tree"><tbody>';
-			if (!empty($parent)) {
-				$u = $unique ? 'c' : 't';
-				$html .= '<tr><td ' . ($gen == 0 ? ' abbr="p' . $primaryChildFamily->getXref() . '@' . $u . '"' : '') . '>';
-				$html .= $this->drawPerson($parent, $gen - 1, 1, $primaryChildFamily, $u);
-				$html .= '</td></tr>';
-			}
-			if (count($fop)) {
-				$n  = 0;
-				$nb = count($fop);
-				foreach ($fop as $p) {
-					$n++;
-					$u = $unique ? 'c' : ($n == $nb || empty($p[1]) ? 'b' : 'h');
-					$html .= '<tr><td ' . ($gen == 0 ? ' abbr="p' . $p[1]->getXref() . '@' . $u . '"' : '') . '>' . $this->drawPerson($p[0], $gen - 1, 1, $p[1], $u) . '</td></tr>';
-				}
-			}
-			$html .= '</tbody></table></td>';
-		}
-		if ($state < 0) {
-			$html .= $this->drawVerticalLine($order);
-		}
-		$html .= '</tr></tbody></table>';
-		if ($isRoot) {
-			$html .= '</td><td id="tv_tree_right"></td></tr><tr><td id="tv_tree_bottomleft"></td><td id="tv_tree_bottom"></td><td id="tv_tree_bottomright"></td></tr></tbody></table>';
-		}
+        $primaryChildFamily = $person->getPrimaryChildFamily();
+        if (!empty($primaryChildFamily)) {
+            $parent = $primaryChildFamily->getHusband();
+            if (empty($parent)) {
+                $parent = $primaryChildFamily->getWife();
+            }
+        }
+        if (!empty($parent) || count($fop) || ($state < 0)) {
+            $html .= $this->drawHorizontalLine();
+        }
+        /* draw the parents */
+        if ($state >= 0 && (!empty($parent) || count($fop))) {
+            $unique = (empty($parent) || count($fop) == 0);
+            $html .= '<td align="left"><table class="tv_tree"><tbody>';
+            if (!empty($parent)) {
+                $u = $unique ? 'c' : 't';
+                $html .= '<tr><td ' . ($gen == 0 ? ' abbr="p' . $primaryChildFamily->getXref() . '@' . $u . '"' : '') . '>';
+                $html .= $this->drawPerson($parent, $gen - 1, 1, $primaryChildFamily, $u);
+                $html .= '</td></tr>';
+            }
+            if (count($fop)) {
+                $n  = 0;
+                $nb = count($fop);
+                foreach ($fop as $p) {
+                    $n++;
+                    $u = $unique ? 'c' : ($n == $nb || empty($p[1]) ? 'b' : 'h');
+                    $html .= '<tr><td ' . ($gen == 0 ? ' abbr="p' . $p[1]->getXref() . '@' . $u . '"' : '') . '>' . $this->drawPerson($p[0], $gen - 1, 1, $p[1], $u) . '</td></tr>';
+                }
+            }
+            $html .= '</tbody></table></td>';
+        }
+        if ($state < 0) {
+            $html .= $this->drawVerticalLine($order);
+        }
+        $html .= '</tr></tbody></table>';
+        if ($isRoot) {
+            $html .= '</td><td id="tv_tree_right"></td></tr><tr><td id="tv_tree_bottomleft"></td><td id="tv_tree_bottom"></td><td id="tv_tree_bottomright"></td></tr></tbody></table>';
+        }
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Draw a person name preceded by sex icon, with parents as tooltip
-	 *
-	 * @param Individual $individual an individual
-	 * @param string        $dashed     if = 'dashed' print dashed top border to separate multiple spuses
-	 *
-	 * @return string
-	 */
-	private function drawPersonName(Individual $individual, $dashed = '') {
-		if ($this->all_partners === 'true') {
-			$family = $individual->getPrimaryChildFamily();
-			if ($family) {
-				$family_name = strip_tags($family->getFullName());
-			} else {
-				$family_name = I18N::translateContext('unknown family', 'unknown');
-			}
-			switch ($individual->getSex()) {
-			case 'M':
-				$title = ' title="' . /* I18N: e.g. “Son of [father name & mother name]” */ I18N::translate('Son of %s', $family_name) . '"';
-				break;
-			case 'F':
-				$title = ' title="' . /* I18N: e.g. “Daughter of [father name & mother name]” */ I18N::translate('Daughter of %s', $family_name) . '"';
-				break;
-			default:
-				$title = ' title="' . /* I18N: e.g. “Child of [father name & mother name]” */ I18N::translate('Child of %s', $family_name) . '"';
-				break;
-			}
-		} else {
-			$title = '';
-		}
-		$sex = $individual->getSex();
+    /**
+     * Draw a person name preceded by sex icon, with parents as tooltip
+     *
+     * @param Individual $individual an individual
+     * @param string        $dashed     if = 'dashed' print dashed top border to separate multiple spuses
+     *
+     * @return string
+     */
+    private function drawPersonName(Individual $individual, $dashed = '') {
+        if ($this->all_partners === 'true') {
+            $family = $individual->getPrimaryChildFamily();
+            if ($family) {
+                $family_name = strip_tags($family->getFullName());
+            } else {
+                $family_name = I18N::translateContext('unknown family', 'unknown');
+            }
+            switch ($individual->getSex()) {
+            case 'M':
+                $title = ' title="' . /* I18N: e.g. “Son of [father name & mother name]” */ I18N::translate('Son of %s', $family_name) . '"';
+                break;
+            case 'F':
+                $title = ' title="' . /* I18N: e.g. “Daughter of [father name & mother name]” */ I18N::translate('Daughter of %s', $family_name) . '"';
+                break;
+            default:
+                $title = ' title="' . /* I18N: e.g. “Child of [father name & mother name]” */ I18N::translate('Child of %s', $family_name) . '"';
+                break;
+            }
+        } else {
+            $title = '';
+        }
+        $sex = $individual->getSex();
 
-		return '<div class="tv' . $sex . ' ' . $dashed . '"' . $title . '><a href="' . $individual->getHtmlUrl() . '"></a>' . $individual->getFullName() . ' <span class="dates">' . $individual->getLifeSpan() . '</span></div>';
-	}
+        return '<div class="tv' . $sex . ' ' . $dashed . '"' . $title . '><a href="' . $individual->getHtmlUrl() . '"></a>' . $individual->getFullName() . ' <span class="dates">' . $individual->getLifeSpan() . '</span></div>';
+    }
 
-	/**
-	 * Get the thumbnail image for the given person
-	 *
-	 * @param Individual $individual
-	 *
-	 * @return string
-	 */
-	private function getThumbnail(Individual $individual) {
-		if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
-			return $individual->displayImage();
-		} else {
-			return '';
-		}
-	}
+    /**
+     * Get the thumbnail image for the given person
+     *
+     * @param Individual $individual
+     *
+     * @return string
+     */
+    private function getThumbnail(Individual $individual) {
+        if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
+            return $individual->displayImage();
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Draw a vertical line
-	 *
-	 * @param string $order A parameter that set how to draw this line with auto-redimensionning capabilities
-	 *
-	 * @return string
-	 * WARNING : some tricky hacks are required in CSS to ensure cross-browser compliance
-	 * some browsers shows an image, which imply a size limit in height,
-	 * and some other browsers (ex: firefox) shows a <div> tag, which have no size limit in height
-	 * Therefore, Firefox is a good choice to print very big trees.
-	 */
-	private function drawVerticalLine($order) {
-		return '<td class="tv_vline tv_vline_' . $order . '"><div class="tv_vline tv_vline_' . $order . '"></div></td>';
-	}
+    /**
+     * Draw a vertical line
+     *
+     * @param string $order A parameter that set how to draw this line with auto-redimensionning capabilities
+     *
+     * @return string
+     * WARNING : some tricky hacks are required in CSS to ensure cross-browser compliance
+     * some browsers shows an image, which imply a size limit in height,
+     * and some other browsers (ex: firefox) shows a <div> tag, which have no size limit in height
+     * Therefore, Firefox is a good choice to print very big trees.
+     */
+    private function drawVerticalLine($order) {
+        return '<td class="tv_vline tv_vline_' . $order . '"><div class="tv_vline tv_vline_' . $order . '"></div></td>';
+    }
 
-	/**
-	 * Draw an horizontal line
-	 */
-	private function drawHorizontalLine() {
-		return '<td class="tv_hline"><div class="tv_hline"></div></td>';
-	}
+    /**
+     * Draw an horizontal line
+     */
+    private function drawHorizontalLine() {
+        return '<td class="tv_hline"><div class="tv_hline"></div></td>';
+    }
 }

Switch Indentation +28 added lines, -28 removed lines

@@ -92,25 +92,25 @@ 
 			$firstLetter = substr($jsonRequest, 0, 1);
 			$jsonRequest = substr($jsonRequest, 1);
 			switch ($firstLetter) {
-			case 'c':
-				$fidlist = explode(',', $jsonRequest);
-				$flist   = array();
-				foreach ($fidlist as $fid) {
-					$flist[] = Family::getInstance($fid, $WT_TREE);
-				}
-				$r[] = $this->drawChildren($flist, 1, true);
-				break;
-			case 'p':
-				$params = explode('@', $jsonRequest);
-				$fid    = $params[0];
-				$order  = $params[1];
-				$f      = Family::getInstance($fid, $WT_TREE);
-				if ($f->getHusband()) {
-					$r[] = $this->drawPerson($f->getHusband(), 0, 1, $f, $order);
-				} elseif ($f->getWife()) {
-					$r[] = $this->drawPerson($f->getWife(), 0, 1, $f, $order);
-				}
-				break;
+			    case 'c':
+				    $fidlist = explode(',', $jsonRequest);
+				    $flist   = array();
+				    foreach ($fidlist as $fid) {
+					    $flist[] = Family::getInstance($fid, $WT_TREE);
+				    }
+				    $r[] = $this->drawChildren($flist, 1, true);
+				    break;
+			    case 'p':
+				    $params = explode('@', $jsonRequest);
+				    $fid    = $params[0];
+				    $order  = $params[1];
+				    $f      = Family::getInstance($fid, $WT_TREE);
+				    if ($f->getHusband()) {
+					    $r[] = $this->drawPerson($f->getHusband(), 0, 1, $f, $order);
+				    } elseif ($f->getWife()) {
+					    $r[] = $this->drawPerson($f->getWife(), 0, 1, $f, $order);
+				    }
+				    break;
 			}
 		}
 
@@ -342,15 +342,15 @@ 
 				$family_name = I18N::translateContext('unknown family', 'unknown');
 			}
 			switch ($individual->getSex()) {
-			case 'M':
-				$title = ' title="' . /* I18N: e.g. “Son of [father name & mother name]” */ I18N::translate('Son of %s', $family_name) . '"';
-				break;
-			case 'F':
-				$title = ' title="' . /* I18N: e.g. “Daughter of [father name & mother name]” */ I18N::translate('Daughter of %s', $family_name) . '"';
-				break;
-			default:
-				$title = ' title="' . /* I18N: e.g. “Child of [father name & mother name]” */ I18N::translate('Child of %s', $family_name) . '"';
-				break;
+			    case 'M':
+				    $title = ' title="' . /* I18N: e.g. “Son of [father name & mother name]” */ I18N::translate('Son of %s', $family_name) . '"';
+				    break;
+			    case 'F':
+				    $title = ' title="' . /* I18N: e.g. “Daughter of [father name & mother name]” */ I18N::translate('Daughter of %s', $family_name) . '"';
+				    break;
+			    default:
+				    $title = ' title="' . /* I18N: e.g. “Child of [father name & mother name]” */ I18N::translate('Child of %s', $family_name) . '"';
+				    break;
 			}
 		} else {
 			$title = '';

Braces +24 added lines, -12 removed lines

@@ -23,7 +23,8 @@ 
 /**
  * Class TreeView
  */
-class TreeView {
+class TreeView
+{
 	/** @var string HTML element name */
 	private $name;
 
@@ -35,7 +36,8 @@ 
 	 *
 	 * @param string $name the name of the TreeView object’s instance
 	 */
-	public function __construct($name = 'tree') {
+	public function __construct($name = 'tree')
+	{
 		$this->name         = $name;
 		$this->all_partners = Filter::cookie('allPartners', 'true|false', 'true');
 	}
@@ -49,7 +51,8 @@ 
 	 *
 	 * @return string[]  HTML and Javascript
 	 */
-	public function drawViewport(Individual $root_person, $generations) {
+	public function drawViewport(Individual $root_person, $generations)
+	{
 		$html = '
 			<a name="tv_content"></a>
 			<div id="' . $this->name . '_out" class="tv_out">
@@ -83,7 +86,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getPersons($list) {
+	public function getPersons($list)
+	{
 		global $WT_TREE;
 
 		$list = explode(';', $list);
@@ -124,7 +128,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDetails(Individual $individual) {
+	public function getDetails(Individual $individual)
+	{
 		$html = $this->getPersonDetails($individual, null);
 		foreach ($individual->getSpouseFamilies() as $family) {
 			$spouse = $family->getSpouse($individual);
@@ -144,7 +149,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getPersonDetails(Individual $individual, Family $family = null) {
+	private function getPersonDetails(Individual $individual, Family $family = null)
+	{
 		$hmtl = $this->getThumbnail($individual);
 		$hmtl .= '<a class="tv_link" href="' . $individual->getHtmlUrl() . '">' . $individual->getFullName() . '</a> <a href="module.php?mod=tree&amp;mod_action=treeview&amp;rootid=' . $individual->getXref() . '" title="' . I18N::translate('Interactive tree of %s', strip_tags($individual->getFullName())) . '" class="icon-button_indi tv_link tv_treelink"></a>';
 		foreach ($individual->getFacts(WT_EVENTS_BIRT, true) as $fact) {
@@ -171,7 +177,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function drawChildren(array $familyList, $gen = 1, $ajax = false) {
+	private function drawChildren(array $familyList, $gen = 1, $ajax = false)
+	{
 		$html          = '';
 		$children2draw = array();
 		$f2load        = array();
@@ -230,7 +237,8 @@ 
 	 * (for "life partner") here fits much better than "spouse" or "mate"
 	 * to translate properly the modern french meaning of "conjoint"
 	 */
-	private function drawPerson(Individual $person, $gen, $state, Family $pfamily = null, $order = null, $isRoot = false) {
+	private function drawPerson(Individual $person, $gen, $state, Family $pfamily = null, $order = null, $isRoot = false)
+	{
 		if ($gen < 0) {
 			return '';
 		}
@@ -333,7 +341,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function drawPersonName(Individual $individual, $dashed = '') {
+	private function drawPersonName(Individual $individual, $dashed = '')
+	{
 		if ($this->all_partners === 'true') {
 			$family = $individual->getPrimaryChildFamily();
 			if ($family) {
@@ -367,7 +376,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getThumbnail(Individual $individual) {
+	private function getThumbnail(Individual $individual)
+	{
 		if ($individual->getTree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) {
 			return $individual->displayImage();
 		} else {
@@ -386,14 +396,16 @@ 
 	 * and some other browsers (ex: firefox) shows a <div> tag, which have no size limit in height
 	 * Therefore, Firefox is a good choice to print very big trees.
 	 */
-	private function drawVerticalLine($order) {
+	private function drawVerticalLine($order)
+	{
 		return '<td class="tv_vline tv_vline_' . $order . '"><div class="tv_vline tv_vline_' . $order . '"></div></td>';
 	}
 
 	/**
 	 * Draw an horizontal line
 	 */
-	private function drawHorizontalLine() {
+	private function drawHorizontalLine()
+	{
 		return '<td class="tv_hline"><div class="tv_hline"></div></td>';
 	}
 }

app/Module/DescendancyModule.php

Indentation +195 added lines, -195 removed lines

@@ -26,70 +26,70 @@ 
  * Class DescendancyModule
  */
 class DescendancyModule extends AbstractModule implements ModuleSidebarInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module/sidebar */
-			I18N::translate('Descendants');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module/sidebar */
+            I18N::translate('Descendants');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Descendants” module */
-			I18N::translate('A sidebar showing the descendants of an individual.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Descendants” module */
+            I18N::translate('A sidebar showing the descendants of an individual.');
+    }
 
-	/**
-	 * This is a general purpose hook, allowing modules to respond to routes
-	 * of the form module.php?mod=FOO&mod_action=BAR
-	 *
-	 * @param string $mod_action
-	 */
-	public function modAction($mod_action) {
-		global $WT_TREE;
+    /**
+     * This is a general purpose hook, allowing modules to respond to routes
+     * of the form module.php?mod=FOO&mod_action=BAR
+     *
+     * @param string $mod_action
+     */
+    public function modAction($mod_action) {
+        global $WT_TREE;
 
-		header('Content-Type: text/html; charset=UTF-8');
+        header('Content-Type: text/html; charset=UTF-8');
 
-		switch ($mod_action) {
-		case 'search':
-			$search = Filter::get('search');
-			echo $this->search($search, $WT_TREE);
-			break;
-		case 'descendants':
-			$individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
-			if ($individual) {
-				echo $this->loadSpouses($individual, 1);
-			}
-			break;
-		default:
-			http_response_code(404);
-			break;
-		}
-	}
+        switch ($mod_action) {
+        case 'search':
+            $search = Filter::get('search');
+            echo $this->search($search, $WT_TREE);
+            break;
+        case 'descendants':
+            $individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
+            if ($individual) {
+                echo $this->loadSpouses($individual, 1);
+            }
+            break;
+        default:
+            http_response_code(404);
+            break;
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
-		return 30;
-	}
+    /** {@inheritdoc} */
+    public function defaultSidebarOrder() {
+        return 30;
+    }
 
-	/** {@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('
 			function dsearchQ() {
 				var query = jQuery("#sb_desc_name").val();
 				if (query.length>1) {
@@ -129,154 +129,154 @@ 
 			});
 		');
 
-		return
-			'<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=search" onsubmit="return false;">' .
-			'<input type="search" name="sb_desc_name" id="sb_desc_name" placeholder="' . I18N::translate('Search') . '">' .
-			'</form>' .
-			'<div id="sb_desc_content">' .
-			'<ul>' . $this->getPersonLi($controller->record, 1) . '</ul>' .
-			'</div>';
-	}
+        return
+            '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=search" onsubmit="return false;">' .
+            '<input type="search" name="sb_desc_name" id="sb_desc_name" placeholder="' . I18N::translate('Search') . '">' .
+            '</form>' .
+            '<div id="sb_desc_content">' .
+            '<ul>' . $this->getPersonLi($controller->record, 1) . '</ul>' .
+            '</div>';
+    }
 
-	/**
-	 * Format an individual in a list.
-	 *
-	 * @param Individual $person
-	 * @param int        $generations
-	 *
-	 * @return string
-	 */
-	public function getPersonLi(Individual $person, $generations = 0) {
-		$icon     = $generations > 0 ? 'icon-minus' : 'icon-plus';
-		$lifespan = $person->canShow() ? '(' . $person->getLifeSpan() . ')' : '';
-		$spouses  = $generations > 0 ? $this->loadSpouses($person, 0) : '';
+    /**
+     * Format an individual in a list.
+     *
+     * @param Individual $person
+     * @param int        $generations
+     *
+     * @return string
+     */
+    public function getPersonLi(Individual $person, $generations = 0) {
+        $icon     = $generations > 0 ? 'icon-minus' : 'icon-plus';
+        $lifespan = $person->canShow() ? '(' . $person->getLifeSpan() . ')' : '';
+        $spouses  = $generations > 0 ? $this->loadSpouses($person, 0) : '';
 
-		return
-			'<li class="sb_desc_indi_li">' .
-			'<a class="sb_desc_indi" href="module.php?mod=' . $this->getName() . '&amp;mod_action=descendants&amp;xref=' . $person->getXref() . '">' .
-			'<i class="plusminus ' . $icon . '"></i>' .
-			$person->getSexImage() . $person->getFullName() . $lifespan .
-			'</a>' .
-			'<a class="icon-button_indi" href="' . $person->getHtmlUrl() . '"></a>' .
-			'<div>' . $spouses . '</div>' .
-			'</li>';
-	}
+        return
+            '<li class="sb_desc_indi_li">' .
+            '<a class="sb_desc_indi" href="module.php?mod=' . $this->getName() . '&amp;mod_action=descendants&amp;xref=' . $person->getXref() . '">' .
+            '<i class="plusminus ' . $icon . '"></i>' .
+            $person->getSexImage() . $person->getFullName() . $lifespan .
+            '</a>' .
+            '<a class="icon-button_indi" href="' . $person->getHtmlUrl() . '"></a>' .
+            '<div>' . $spouses . '</div>' .
+            '</li>';
+    }
 
-	/**
-	 * Format a family in a list.
-	 *
-	 * @param Family     $family
-	 * @param Individual $person
-	 * @param int        $generations
-	 *
-	 * @return string
-	 */
-	public function getFamilyLi(Family $family, Individual $person, $generations = 0) {
-		$spouse = $family->getSpouse($person);
-		if ($spouse) {
-			$spouse_name = $spouse->getSexImage() . $spouse->getFullName();
-			$spouse_link = '<a class="icon-button_indi" href="' . $spouse->getHtmlUrl() . '"></a>';
-		} else {
-			$spouse_name = '';
-			$spouse_link = '';
-		}
+    /**
+     * Format a family in a list.
+     *
+     * @param Family     $family
+     * @param Individual $person
+     * @param int        $generations
+     *
+     * @return string
+     */
+    public function getFamilyLi(Family $family, Individual $person, $generations = 0) {
+        $spouse = $family->getSpouse($person);
+        if ($spouse) {
+            $spouse_name = $spouse->getSexImage() . $spouse->getFullName();
+            $spouse_link = '<a class="icon-button_indi" href="' . $spouse->getHtmlUrl() . '"></a>';
+        } else {
+            $spouse_name = '';
+            $spouse_link = '';
+        }
 
-		$marryear = $family->getMarriageYear();
-		$marr     = $marryear ? '<i class="icon-rings"></i>' . $marryear : '';
+        $marryear = $family->getMarriageYear();
+        $marr     = $marryear ? '<i class="icon-rings"></i>' . $marryear : '';
 
-		return
-			'<li class="sb_desc_indi_li">' .
-			'<a class="sb_desc_indi" href="#"><i class="plusminus icon-minus"></i>' . $spouse_name . $marr . '</a>' .
-			$spouse_link .
-			'<a href="' . $family->getHtmlUrl() . '" class="icon-button_family"></a>' .
-		 '<div>' . $this->loadChildren($family, $generations) . '</div>' .
-			'</li>';
-	}
+        return
+            '<li class="sb_desc_indi_li">' .
+            '<a class="sb_desc_indi" href="#"><i class="plusminus icon-minus"></i>' . $spouse_name . $marr . '</a>' .
+            $spouse_link .
+            '<a href="' . $family->getHtmlUrl() . '" class="icon-button_family"></a>' .
+            '<div>' . $this->loadChildren($family, $generations) . '</div>' .
+            '</li>';
+    }
 
-	/**
-	 * Respond to an autocomplete search request.
-	 *
-	 * @param string $query Search for this term
-	 * @param Tree   $tree  Search in this tree
-	 *
-	 * @return string
-	 */
-	public function search($query, Tree $tree) {
-		if (strlen($query) < 2) {
-			return '';
-		}
+    /**
+     * Respond to an autocomplete search request.
+     *
+     * @param string $query Search for this term
+     * @param Tree   $tree  Search in this tree
+     *
+     * @return string
+     */
+    public function search($query, Tree $tree) {
+        if (strlen($query) < 2) {
+            return '';
+        }
 
-		$rows = Database::prepare(
-			"SELECT i_id AS xref" .
-			" FROM `##individuals`" .
-			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-			" WHERE n_sort LIKE CONCAT('%', :query, '%') AND i_file = :tree_id" .
-			" ORDER BY n_sort"
-		)->execute(array(
-			'query'   => $query,
-			'tree_id' => $tree->getTreeId(),
-		))->fetchAll();
+        $rows = Database::prepare(
+            "SELECT i_id AS xref" .
+            " FROM `##individuals`" .
+            " JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+            " WHERE n_sort LIKE CONCAT('%', :query, '%') AND i_file = :tree_id" .
+            " ORDER BY n_sort"
+        )->execute(array(
+            'query'   => $query,
+            'tree_id' => $tree->getTreeId(),
+        ))->fetchAll();
 
-		$out = '';
-		foreach ($rows as $row) {
-			$person = Individual::getInstance($row->xref, $tree);
-			if ($person && $person->canShowName()) {
-				$out .= $this->getPersonLi($person);
-			}
-		}
-		if ($out) {
-			return '<ul>' . $out . '</ul>';
-		} else {
-			return '';
-		}
-	}
+        $out = '';
+        foreach ($rows as $row) {
+            $person = Individual::getInstance($row->xref, $tree);
+            if ($person && $person->canShowName()) {
+                $out .= $this->getPersonLi($person);
+            }
+        }
+        if ($out) {
+            return '<ul>' . $out . '</ul>';
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Display spouses.
-	 *
-	 * @param Individual $person
-	 * @param int        $generations
-	 *
-	 * @return string
-	 */
-	public function loadSpouses(Individual $person, $generations) {
-		$out = '';
-		if ($person && $person->canShow()) {
-			foreach ($person->getSpouseFamilies() as $family) {
-				$out .= $this->getFamilyLi($family, $person, $generations - 1);
-			}
-		}
-		if ($out) {
-			return '<ul>' . $out . '</ul>';
-		} else {
-			return '';
-		}
-	}
+    /**
+     * Display spouses.
+     *
+     * @param Individual $person
+     * @param int        $generations
+     *
+     * @return string
+     */
+    public function loadSpouses(Individual $person, $generations) {
+        $out = '';
+        if ($person && $person->canShow()) {
+            foreach ($person->getSpouseFamilies() as $family) {
+                $out .= $this->getFamilyLi($family, $person, $generations - 1);
+            }
+        }
+        if ($out) {
+            return '<ul>' . $out . '</ul>';
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Display descendants.
-	 *
-	 * @param Family $family
-	 * @param int    $generations
-	 *
-	 * @return string
-	 */
-	public function loadChildren(Family $family, $generations) {
-		$out = '';
-		if ($family->canShow()) {
-			$children = $family->getChildren();
-			if ($children) {
-				foreach ($children as $child) {
-					$out .= $this->getPersonLi($child, $generations - 1);
-				}
-			} else {
-				$out .= '<li class="sb_desc_none">' . I18N::translate('No children') . '</li>';
-			}
-		}
-		if ($out) {
-			return '<ul>' . $out . '</ul>';
-		} else {
-			return '';
-		}
-	}
+    /**
+     * Display descendants.
+     *
+     * @param Family $family
+     * @param int    $generations
+     *
+     * @return string
+     */
+    public function loadChildren(Family $family, $generations) {
+        $out = '';
+        if ($family->canShow()) {
+            $children = $family->getChildren();
+            if ($children) {
+                foreach ($children as $child) {
+                    $out .= $this->getPersonLi($child, $generations - 1);
+                }
+            } else {
+                $out .= '<li class="sb_desc_none">' . I18N::translate('No children') . '</li>';
+            }
+        }
+        if ($out) {
+            return '<ul>' . $out . '</ul>';
+        } else {
+            return '';
+        }
+    }
 }

Switch Indentation +13 added lines, -13 removed lines

@@ -50,19 +50,19 @@
 		header('Content-Type: text/html; charset=UTF-8');
 
 		switch ($mod_action) {
-		case 'search':
-			$search = Filter::get('search');
-			echo $this->search($search, $WT_TREE);
-			break;
-		case 'descendants':
-			$individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
-			if ($individual) {
-				echo $this->loadSpouses($individual, 1);
-			}
-			break;
-		default:
-			http_response_code(404);
-			break;
+		    case 'search':
+			    $search = Filter::get('search');
+			    echo $this->search($search, $WT_TREE);
+			    break;
+		    case 'descendants':
+			    $individual = Individual::getInstance(Filter::get('xref', WT_REGEX_XREF), $WT_TREE);
+			    if ($individual) {
+				    echo $this->loadSpouses($individual, 1);
+			    }
+			    break;
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 

Braces +26 added lines, -13 removed lines

@@ -25,15 +25,18 @@ 
 /**
  * Class DescendancyModule
  */
-class DescendancyModule extends AbstractModule implements ModuleSidebarInterface {
+class DescendancyModule extends AbstractModule implements ModuleSidebarInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/sidebar */
 			I18N::translate('Descendants');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Descendants” module */
 			I18N::translate('A sidebar showing the descendants of an individual.');
 	}
@@ -44,7 +47,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		global $WT_TREE;
 
 		header('Content-Type: text/html; charset=UTF-8');
@@ -67,17 +71,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function defaultSidebarOrder() {
+	public function defaultSidebarOrder()
+	{
 		return 30;
 	}
 
 	/** {@inheritdoc} */
-	public function hasSidebarContent() {
+	public function hasSidebarContent()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function getSidebarAjaxContent() {
+	public function getSidebarAjaxContent()
+	{
 		return '';
 	}
 
@@ -86,7 +93,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getSidebarContent() {
+	public function getSidebarContent()
+	{
 		global $controller;
 
 		$controller->addInlineJavascript('
@@ -146,7 +154,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getPersonLi(Individual $person, $generations = 0) {
+	public function getPersonLi(Individual $person, $generations = 0)
+	{
 		$icon     = $generations > 0 ? 'icon-minus' : 'icon-plus';
 		$lifespan = $person->canShow() ? '(' . $person->getLifeSpan() . ')' : '';
 		$spouses  = $generations > 0 ? $this->loadSpouses($person, 0) : '';
@@ -171,7 +180,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getFamilyLi(Family $family, Individual $person, $generations = 0) {
+	public function getFamilyLi(Family $family, Individual $person, $generations = 0)
+	{
 		$spouse = $family->getSpouse($person);
 		if ($spouse) {
 			$spouse_name = $spouse->getSexImage() . $spouse->getFullName();
@@ -201,7 +211,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function search($query, Tree $tree) {
+	public function search($query, Tree $tree)
+	{
 		if (strlen($query) < 2) {
 			return '';
 		}
@@ -239,7 +250,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function loadSpouses(Individual $person, $generations) {
+	public function loadSpouses(Individual $person, $generations)
+	{
 		$out = '';
 		if ($person && $person->canShow()) {
 			foreach ($person->getSpouseFamilies() as $family) {
@@ -261,7 +273,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function loadChildren(Family $family, $generations) {
+	public function loadChildren(Family $family, $generations)
+	{
 		$out = '';
 		if ($family->canShow()) {
 			$children = $family->getChildren();

app/Module/PageMenuModule.php

Indentation +32 added lines, -32 removed lines

@@ -23,42 +23,42 @@
  * Class PageMenuModule
  */
 class PageMenuModule extends AbstractModule implements ModuleMenuInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module/menu */ I18N::translate('Edit');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module/menu */ I18N::translate('Edit');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Edit” module */ I18N::translate('An edit menu for individuals, families, sources, etc.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Edit” module */ I18N::translate('An edit menu for individuals, families, sources, etc.');
+    }
 
-	/**
-	 * The user can re-order menus. Until they do, they are shown in this order.
-	 *
-	 * @return int
-	 */
-	public function defaultMenuOrder() {
-		return 10;
-	}
+    /**
+     * The user can re-order menus. Until they do, they are shown in this order.
+     *
+     * @return int
+     */
+    public function defaultMenuOrder() {
+        return 10;
+    }
 
-	/**
-	 * A menu, to be added to the main application menu.
-	 *
-	 * @return Menu|null
-	 */
-	public function getMenu() {
-		global $controller, $WT_TREE;
+    /**
+     * A menu, to be added to the main application menu.
+     *
+     * @return Menu|null
+     */
+    public function getMenu() {
+        global $controller, $WT_TREE;
 
-		$menu = null;
-		if (empty($controller)) {
-			return null;
-		}
+        $menu = null;
+        if (empty($controller)) {
+            return null;
+        }
 
-		if (Auth::isEditor($WT_TREE) && method_exists($controller, 'getEditMenu')) {
-			$menu = $controller->getEditMenu();
-		}
+        if (Auth::isEditor($WT_TREE) && method_exists($controller, 'getEditMenu')) {
+            $menu = $controller->getEditMenu();
+        }
 
-		return $menu;
-	}
+        return $menu;
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -22,14 +22,17 @@ 
 /**
  * Class PageMenuModule
  */
-class PageMenuModule extends AbstractModule implements ModuleMenuInterface {
+class PageMenuModule extends AbstractModule implements ModuleMenuInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/menu */ I18N::translate('Edit');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Edit” module */ I18N::translate('An edit menu for individuals, families, sources, etc.');
 	}
 
@@ -38,7 +41,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultMenuOrder() {
+	public function defaultMenuOrder()
+	{
 		return 10;
 	}
 
@@ -47,7 +51,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getMenu() {
+	public function getMenu()
+	{
 		global $controller, $WT_TREE;
 
 		$menu = null;