fisharebest / webtrees

indilist.php

Indentation +180 added lines, -180 removed lines

@@ -39,226 +39,226 @@
 // Long lists can be broken down by given name
 $show_all_firstnames = Filter::get('show_all_firstnames', 'no|yes', 'no');
 if ($show_all_firstnames === 'yes') {
-	$falpha = '';
+    $falpha = '';
 } else {
-	$falpha = Filter::get('falpha'); // All first names beginning with this letter
+    $falpha = Filter::get('falpha'); // All first names beginning with this letter
 }
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
 case 'no':
 case 'yes':
-	Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
-	break;
+    Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
+    break;
 default:
-	$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
+    $show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
 }
 
 // Make sure selections are consistent.
 // i.e. can’t specify show_all and surname at the same time.
 if ($show_all === 'yes') {
-	if ($show_all_firstnames === 'yes') {
-		$alpha   = '';
-		$surname = '';
-		$legend  = I18N::translate('All');
-		$url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
-		$show    = 'indi';
-	} elseif ($falpha) {
-		$alpha   = '';
-		$surname = '';
-		$legend  = I18N::translate('All') . ', ' . Filter::escapeHtml($falpha) . '…';
-		$url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
-		$show    = 'indi';
-	} else {
-		$alpha   = '';
-		$surname = '';
-		$legend  = I18N::translate('All');
-		$url     = WT_SCRIPT_NAME . '?show_all=yes' . '&ged=' . $WT_TREE->getNameUrl();
-		$show    = Filter::get('show', 'surn|indi', 'surn');
-	}
+    if ($show_all_firstnames === 'yes') {
+        $alpha   = '';
+        $surname = '';
+        $legend  = I18N::translate('All');
+        $url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
+        $show    = 'indi';
+    } elseif ($falpha) {
+        $alpha   = '';
+        $surname = '';
+        $legend  = I18N::translate('All') . ', ' . Filter::escapeHtml($falpha) . '…';
+        $url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
+        $show    = 'indi';
+    } else {
+        $alpha   = '';
+        $surname = '';
+        $legend  = I18N::translate('All');
+        $url     = WT_SCRIPT_NAME . '?show_all=yes' . '&ged=' . $WT_TREE->getNameUrl();
+        $show    = Filter::get('show', 'surn|indi', 'surn');
+    }
 } elseif ($surname) {
-	$alpha    = QueryName::initialLetter($surname); // so we can highlight the initial letter
-	$show_all = 'no';
-	if ($surname === '@N.N.') {
-		$legend = I18N::translateContext('Unknown surname', '…');
-	} else {
-		$legend = Filter::escapeHtml($surname);
-		// The surname parameter is a root/canonical form.
-		// Display it as the actual surname
-		foreach (QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', false) as $details) {
-			$legend = implode('/', array_keys($details));
-		}
-	}
-	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
-	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	}
-	$show = 'indi'; // SURN list makes no sense here
+    $alpha    = QueryName::initialLetter($surname); // so we can highlight the initial letter
+    $show_all = 'no';
+    if ($surname === '@N.N.') {
+        $legend = I18N::translateContext('Unknown surname', '…');
+    } else {
+        $legend = Filter::escapeHtml($surname);
+        // The surname parameter is a root/canonical form.
+        // Display it as the actual surname
+        foreach (QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', false) as $details) {
+            $legend = implode('/', array_keys($details));
+        }
+    }
+    $url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
+    switch ($falpha) {
+    case '':
+        break;
+    case '@':
+        $legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+        $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+        break;
+    default:
+        $legend .= ', ' . Filter::escapeHtml($falpha) . '…';
+        $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+        break;
+    }
+    $show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
-	$show_all = 'no';
-	$legend   = I18N::translateContext('Unknown surname', '…');
-	$url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
-	$show     = 'indi'; // SURN list makes no sense here
+    $show_all = 'no';
+    $legend   = I18N::translateContext('Unknown surname', '…');
+    $url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
+    $show     = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === ',') {
-	$show_all = 'no';
-	$legend   = I18N::translate('None');
-	$url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
-	$show     = 'indi'; // SURN list makes no sense here
+    $show_all = 'no';
+    $legend   = I18N::translate('None');
+    $url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
+    $show     = 'indi'; // SURN list makes no sense here
 } elseif ($alpha) {
-	$show_all = 'no';
-	$legend   = Filter::escapeHtml($alpha) . '…';
-	$url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
-	$show     = Filter::get('show', 'surn|indi', 'surn');
+    $show_all = 'no';
+    $legend   = Filter::escapeHtml($alpha) . '…';
+    $url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
+    $show     = Filter::get('show', 'surn|indi', 'surn');
 } else {
-	$show_all = 'no';
-	$legend   = '…';
-	$url      = WT_SCRIPT_NAME . '?ged=' . $WT_TREE->getNameUrl();
-	$show     = 'none'; // Don't show lists until something is chosen
+    $show_all = 'no';
+    $legend   = '…';
+    $url      = WT_SCRIPT_NAME . '?ged=' . $WT_TREE->getNameUrl();
+    $show     = 'none'; // Don't show lists until something is chosen
 }
 $legend = '<span dir="auto">' . $legend . '</span>';
 
 $controller
-	->setPageTitle(I18N::translate('Individuals') . ' : ' . $legend)
-	->pageHeader();
+    ->setPageTitle(I18N::translate('Individuals') . ' : ' . $legend)
+    ->pageHeader();
 
 echo '<h2 class="center">', I18N::translate('Individuals'), '</h2>';
 
 // Print a selection list of initial letters
 $list = array();
 foreach (QueryName::surnameAlpha($WT_TREE, $show_marnm === 'yes', false) as $letter => $count) {
-	switch ($letter) {
-	case '@':
-		$html = I18N::translateContext('Unknown surname', '…');
-		break;
-	case ',':
-		$html = I18N::translate('None');
-		break;
-	default:
-		$html = Filter::escapeHtml($letter);
-		break;
-	}
-	if ($count) {
-		if ($letter == $alpha) {
-			$list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
-		} else {
-			$list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
-		}
-	} else {
-		$list[] = $html;
-	}
+    switch ($letter) {
+    case '@':
+        $html = I18N::translateContext('Unknown surname', '…');
+        break;
+    case ',':
+        $html = I18N::translate('None');
+        break;
+    default:
+        $html = Filter::escapeHtml($letter);
+        break;
+    }
+    if ($count) {
+        if ($letter == $alpha) {
+            $list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
+        } else {
+            $list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+        }
+    } else {
+        $list[] = $html;
+    }
 }
 
 // Search spiders don't get the "show all" option as the other links give them everything.
 if (!Auth::isSearchEngine()) {
-	if ($show_all === 'yes') {
-		$list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
-	} else {
-		$list[] = '<a href="' . WT_SCRIPT_NAME . '?show_all=yes' . '&amp;ged=' . $WT_TREE->getNameUrl() . '">' . I18N::translate('All') . '</a>';
-	}
+    if ($show_all === 'yes') {
+        $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+    } else {
+        $list[] = '<a href="' . WT_SCRIPT_NAME . '?show_all=yes' . '&amp;ged=' . $WT_TREE->getNameUrl() . '">' . I18N::translate('All') . '</a>';
+    }
 }
 echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
 
 // Search spiders don't get an option to show/hide the surname sublists,
 // nor does it make sense on the all/unknown/surname views
 if (!Auth::isSearchEngine()) {
-	echo '<p class="center">';
-	if ($show !== 'none') {
-		if ($show_marnm === 'yes') {
-			echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=no">', I18N::translate('Exclude individuals with “%s” as a married name', $legend), '</a>';
-		} else {
-			echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=yes">', I18N::translate('Include individuals with “%s” as a married name', $legend), '</a>';
-		}
+    echo '<p class="center">';
+    if ($show !== 'none') {
+        if ($show_marnm === 'yes') {
+            echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=no">', I18N::translate('Exclude individuals with “%s” as a married name', $legend), '</a>';
+        } else {
+            echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=yes">', I18N::translate('Include individuals with “%s” as a married name', $legend), '</a>';
+        }
 
-		if ($alpha !== '@' && $alpha !== ',' && !$surname) {
-			if ($show === 'surn') {
-				echo '<br><a href="', $url, '&amp;show=indi">', I18N::translate('Show the list of individuals'), '</a>';
-			} else {
-				echo '<br><a href="', $url, '&amp;show=surn">', I18N::translate('Show the list of surnames'), '</a>';
-			}
-		}
-	}
-	echo '</p>';
+        if ($alpha !== '@' && $alpha !== ',' && !$surname) {
+            if ($show === 'surn') {
+                echo '<br><a href="', $url, '&amp;show=indi">', I18N::translate('Show the list of individuals'), '</a>';
+            } else {
+                echo '<br><a href="', $url, '&amp;show=surn">', I18N::translate('Show the list of surnames'), '</a>';
+            }
+        }
+    }
+    echo '</p>';
 }
 
 if ($show === 'indi' || $show === 'surn') {
-	$surns = QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', false);
-	if ($show === 'surn') {
-		// Show the surname list
-		switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		}
-	} else {
-		// Show the list
-		$count = 0;
-		foreach ($surns as $surnames) {
-			foreach ($surnames as $list) {
-				$count += count($list);
-			}
-		}
-		// Don't sublists short lists.
-		if ($count < $WT_TREE->getPreference('SUBLIST_TRIGGER_I')) {
-			$falpha              = '';
-			$show_all_firstnames = 'no';
-		} else {
-			$givn_initials = QueryName::givenAlpha($WT_TREE, $surname, $alpha, $show_marnm === 'yes', false);
-			// Break long lists by initial letter of given name
-			if ($surname || $show_all === 'yes') {
-				// Don't show the list until we have some filter criteria
-				$show = ($falpha || $show_all_firstnames === 'yes') ? 'indi' : 'none';
-				$list = array();
-				foreach ($givn_initials as $givn_initial => $count) {
-					switch ($givn_initial) {
-					case '@':
-						$html = I18N::translateContext('Unknown given name', '…');
-						break;
-					default:
-						$html = Filter::escapeHtml($givn_initial);
-						break;
-					}
-					if ($count) {
-						if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {
-							$list[] = '<a class="warning" href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
-						} else {
-							$list[] = '<a href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
-						}
-					} else {
-						$list[] = $html;
-					}
-				}
-				// Search spiders don't get the "show all" option as the other links give them everything.
-				if (!Auth::isSearchEngine()) {
-					if ($show_all_firstnames === 'yes') {
-						$list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
-					} else {
-						$list[] = '<a href="' . $url . '&amp;show_all_firstnames=yes">' . I18N::translate('All') . '</a>';
-					}
-				}
-				if ($show_all === 'no') {
-					echo '<h2 class="center">', I18N::translate('Individuals with surname %s', $legend), '</h2>';
-				}
-				echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
-			}
-		}
-		if ($show === 'indi') {
-			echo FunctionsPrintLists::individualTable(QueryName::individuals($WT_TREE, $surname, $alpha, $falpha, $show_marnm === 'yes', false));
-		}
-	}
+    $surns = QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', false);
+    if ($show === 'surn') {
+        // Show the surname list
+        switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
+        case 'style1':
+            echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
+            break;
+        case 'style3':
+            echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
+            break;
+        case 'style2':
+        default:
+            echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
+            break;
+        }
+    } else {
+        // Show the list
+        $count = 0;
+        foreach ($surns as $surnames) {
+            foreach ($surnames as $list) {
+                $count += count($list);
+            }
+        }
+        // Don't sublists short lists.
+        if ($count < $WT_TREE->getPreference('SUBLIST_TRIGGER_I')) {
+            $falpha              = '';
+            $show_all_firstnames = 'no';
+        } else {
+            $givn_initials = QueryName::givenAlpha($WT_TREE, $surname, $alpha, $show_marnm === 'yes', false);
+            // Break long lists by initial letter of given name
+            if ($surname || $show_all === 'yes') {
+                // Don't show the list until we have some filter criteria
+                $show = ($falpha || $show_all_firstnames === 'yes') ? 'indi' : 'none';
+                $list = array();
+                foreach ($givn_initials as $givn_initial => $count) {
+                    switch ($givn_initial) {
+                    case '@':
+                        $html = I18N::translateContext('Unknown given name', '…');
+                        break;
+                    default:
+                        $html = Filter::escapeHtml($givn_initial);
+                        break;
+                    }
+                    if ($count) {
+                        if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {
+                            $list[] = '<a class="warning" href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+                        } else {
+                            $list[] = '<a href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+                        }
+                    } else {
+                        $list[] = $html;
+                    }
+                }
+                // Search spiders don't get the "show all" option as the other links give them everything.
+                if (!Auth::isSearchEngine()) {
+                    if ($show_all_firstnames === 'yes') {
+                        $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+                    } else {
+                        $list[] = '<a href="' . $url . '&amp;show_all_firstnames=yes">' . I18N::translate('All') . '</a>';
+                    }
+                }
+                if ($show_all === 'no') {
+                    echo '<h2 class="center">', I18N::translate('Individuals with surname %s', $legend), '</h2>';
+                }
+                echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
+            }
+        }
+        if ($show === 'indi') {
+            echo FunctionsPrintLists::individualTable(QueryName::individuals($WT_TREE, $surname, $alpha, $falpha, $show_marnm === 'yes', false));
+        }
+    }
 }

Switch Indentation +41 added lines, -41 removed lines

@@ -46,12 +46,12 @@ 
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
-case 'no':
-case 'yes':
-	Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
-	break;
-default:
-	$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
+    case 'no':
+    case 'yes':
+	    Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
+	    break;
+    default:
+	    $show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
 }
 
 // Make sure selections are consistent.
@@ -91,16 +91,16 @@ 
 	}
 	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
 	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
+	    case '':
+		    break;
+	    case '@':
+		    $legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+		    $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+		    break;
+	    default:
+		    $legend .= ', ' . Filter::escapeHtml($falpha) . '…';
+		    $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+		    break;
 	}
 	$show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
@@ -136,15 +136,15 @@ 
 $list = array();
 foreach (QueryName::surnameAlpha($WT_TREE, $show_marnm === 'yes', false) as $letter => $count) {
 	switch ($letter) {
-	case '@':
-		$html = I18N::translateContext('Unknown surname', '…');
-		break;
-	case ',':
-		$html = I18N::translate('None');
-		break;
-	default:
-		$html = Filter::escapeHtml($letter);
-		break;
+	    case '@':
+		    $html = I18N::translateContext('Unknown surname', '…');
+		    break;
+	    case ',':
+		    $html = I18N::translate('None');
+		    break;
+	    default:
+		    $html = Filter::escapeHtml($letter);
+		    break;
 	}
 	if ($count) {
 		if ($letter == $alpha) {
@@ -194,16 +194,16 @@ 
 	if ($show === 'surn') {
 		// Show the surname list
 		switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
-			break;
+		    case 'style1':
+			    echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
+			    break;
+		    case 'style3':
+			    echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
+			    break;
+		    case 'style2':
+		    default:
+			    echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
+			    break;
 		}
 	} else {
 		// Show the list
@@ -226,12 +226,12 @@ 
 				$list = array();
 				foreach ($givn_initials as $givn_initial => $count) {
 					switch ($givn_initial) {
-					case '@':
-						$html = I18N::translateContext('Unknown given name', '…');
-						break;
-					default:
-						$html = Filter::escapeHtml($givn_initial);
-						break;
+					    case '@':
+						    $html = I18N::translateContext('Unknown given name', '…');
+						    break;
+					    default:
+						    $html = Filter::escapeHtml($givn_initial);
+						    break;
 					}
 					if ($count) {
 						if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {

famlist.php

Indentation +180 added lines, -180 removed lines

@@ -39,226 +39,226 @@
 // Long lists can be broken down by given name
 $show_all_firstnames = Filter::get('show_all_firstnames', 'no|yes', 'no');
 if ($show_all_firstnames === 'yes') {
-	$falpha = '';
+    $falpha = '';
 } else {
-	$falpha = Filter::get('falpha'); // All first names beginning with this letter
+    $falpha = Filter::get('falpha'); // All first names beginning with this letter
 }
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
 case 'no':
 case 'yes':
-	Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
-	break;
+    Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
+    break;
 default:
-	$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
+    $show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
 }
 
 // Make sure selections are consistent.
 // i.e. can’t specify show_all and surname at the same time.
 if ($show_all === 'yes') {
-	if ($show_all_firstnames === 'yes') {
-		$alpha   = '';
-		$surname = '';
-		$legend  = I18N::translate('All');
-		$url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
-		$show    = 'indi';
-	} elseif ($falpha) {
-		$alpha   = '';
-		$surname = '';
-		$legend  = I18N::translate('All') . ', ' . Filter::escapeHtml($falpha) . '…';
-		$url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
-		$show    = 'indi';
-	} else {
-		$alpha   = '';
-		$surname = '';
-		$legend  = I18N::translate('All');
-		$url     = WT_SCRIPT_NAME . '?show_all=yes' . '&ged=' . $WT_TREE->getNameUrl();
-		$show    = Filter::get('show', 'surn|indi', 'surn');
-	}
+    if ($show_all_firstnames === 'yes') {
+        $alpha   = '';
+        $surname = '';
+        $legend  = I18N::translate('All');
+        $url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
+        $show    = 'indi';
+    } elseif ($falpha) {
+        $alpha   = '';
+        $surname = '';
+        $legend  = I18N::translate('All') . ', ' . Filter::escapeHtml($falpha) . '…';
+        $url     = WT_SCRIPT_NAME . '?show_all=yes&ged=' . $WT_TREE->getNameUrl();
+        $show    = 'indi';
+    } else {
+        $alpha   = '';
+        $surname = '';
+        $legend  = I18N::translate('All');
+        $url     = WT_SCRIPT_NAME . '?show_all=yes' . '&ged=' . $WT_TREE->getNameUrl();
+        $show    = Filter::get('show', 'surn|indi', 'surn');
+    }
 } elseif ($surname) {
-	$alpha    = QueryName::initialLetter($surname); // so we can highlight the initial letter
-	$show_all = 'no';
-	if ($surname === '@N.N.') {
-		$legend = I18N::translateContext('Unknown surname', '…');
-	} else {
-		$legend = Filter::escapeHtml($surname);
-		// The surname parameter is a root/canonical form.
-		// Display it as the actual surname
-		foreach (QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', true) as $details) {
-			$legend = implode('/', array_keys($details));
-		}
-	}
-	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
-	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	}
-	$show = 'indi'; // SURN list makes no sense here
+    $alpha    = QueryName::initialLetter($surname); // so we can highlight the initial letter
+    $show_all = 'no';
+    if ($surname === '@N.N.') {
+        $legend = I18N::translateContext('Unknown surname', '…');
+    } else {
+        $legend = Filter::escapeHtml($surname);
+        // The surname parameter is a root/canonical form.
+        // Display it as the actual surname
+        foreach (QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', true) as $details) {
+            $legend = implode('/', array_keys($details));
+        }
+    }
+    $url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
+    switch ($falpha) {
+    case '':
+        break;
+    case '@':
+        $legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+        $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+        break;
+    default:
+        $legend .= ', ' . Filter::escapeHtml($falpha) . '…';
+        $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+        break;
+    }
+    $show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
-	$show_all = 'no';
-	$legend   = I18N::translateContext('Unknown surname', '…');
-	$url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
-	$show     = 'indi'; // SURN list makes no sense here
+    $show_all = 'no';
+    $legend   = I18N::translateContext('Unknown surname', '…');
+    $url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
+    $show     = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === ',') {
-	$show_all = 'no';
-	$legend   = I18N::translate('None');
-	$url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
-	$show     = 'indi'; // SURN list makes no sense here
+    $show_all = 'no';
+    $legend   = I18N::translate('None');
+    $url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
+    $show     = 'indi'; // SURN list makes no sense here
 } elseif ($alpha) {
-	$show_all = 'no';
-	$legend   = Filter::escapeHtml($alpha) . '…';
-	$url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
-	$show     = Filter::get('show', 'surn|indi', 'surn');
+    $show_all = 'no';
+    $legend   = Filter::escapeHtml($alpha) . '…';
+    $url      = WT_SCRIPT_NAME . '?alpha=' . rawurlencode($alpha) . '&ged=' . $WT_TREE->getNameUrl();
+    $show     = Filter::get('show', 'surn|indi', 'surn');
 } else {
-	$show_all = 'no';
-	$legend   = '…';
-	$url      = WT_SCRIPT_NAME . '?ged=' . $WT_TREE->getNameUrl();
-	$show     = 'none'; // Don't show lists until something is chosen
+    $show_all = 'no';
+    $legend   = '…';
+    $url      = WT_SCRIPT_NAME . '?ged=' . $WT_TREE->getNameUrl();
+    $show     = 'none'; // Don't show lists until something is chosen
 }
 $legend = '<span dir="auto">' . $legend . '</span>';
 
 $controller
-	->setPageTitle(I18N::translate('Families') . ' : ' . $legend)
-	->pageHeader();
+    ->setPageTitle(I18N::translate('Families') . ' : ' . $legend)
+    ->pageHeader();
 
 echo '<h2 class="center">', I18N::translate('Families'), '</h2>';
 
 // Print a selection list of initial letters
 $list = array();
 foreach (QueryName::surnameAlpha($WT_TREE, $show_marnm === 'yes', true) as $letter => $count) {
-	switch ($letter) {
-	case '@':
-		$html = I18N::translateContext('Unknown surname', '…');
-		break;
-	case ',':
-		$html = I18N::translate('None');
-		break;
-	default:
-		$html = Filter::escapeHtml($letter);
-		break;
-	}
-	if ($count) {
-		if ($letter == $alpha) {
-			$list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
-		} else {
-			$list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
-		}
-	} else {
-		$list[] = $html;
-	}
+    switch ($letter) {
+    case '@':
+        $html = I18N::translateContext('Unknown surname', '…');
+        break;
+    case ',':
+        $html = I18N::translate('None');
+        break;
+    default:
+        $html = Filter::escapeHtml($letter);
+        break;
+    }
+    if ($count) {
+        if ($letter == $alpha) {
+            $list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
+        } else {
+            $list[] = '<a href="' . WT_SCRIPT_NAME . '?alpha=' . rawurlencode($letter) . '&amp;ged=' . $WT_TREE->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+        }
+    } else {
+        $list[] = $html;
+    }
 }
 
 // Search spiders don't get the "show all" option as the other links give them everything.
 if (!Auth::isSearchEngine()) {
-	if ($show_all === 'yes') {
-		$list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
-	} else {
-		$list[] = '<a href="' . WT_SCRIPT_NAME . '?show_all=yes' . '&amp;ged=' . $WT_TREE->getNameUrl() . '">' . I18N::translate('All') . '</a>';
-	}
+    if ($show_all === 'yes') {
+        $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+    } else {
+        $list[] = '<a href="' . WT_SCRIPT_NAME . '?show_all=yes' . '&amp;ged=' . $WT_TREE->getNameUrl() . '">' . I18N::translate('All') . '</a>';
+    }
 }
 echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
 
 // Search spiders don't get an option to show/hide the surname sublists,
 // nor does it make sense on the all/unknown/surname views
 if (!Auth::isSearchEngine()) {
-	echo '<p class="center">';
-	if ($show !== 'none') {
-		if ($show_marnm === 'yes') {
-			echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=no">', I18N::translate('Exclude individuals with “%s” as a married name', $legend), '</a>';
-		} else {
-			echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=yes">', I18N::translate('Include individuals with “%s” as a married name', $legend), '</a>';
-		}
+    echo '<p class="center">';
+    if ($show !== 'none') {
+        if ($show_marnm === 'yes') {
+            echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=no">', I18N::translate('Exclude individuals with “%s” as a married name', $legend), '</a>';
+        } else {
+            echo '<a href="', $url, '&amp;show=' . $show . '&amp;show_marnm=yes">', I18N::translate('Include individuals with “%s” as a married name', $legend), '</a>';
+        }
 
-		if ($alpha !== '@' && $alpha !== ',' && !$surname) {
-			if ($show === 'surn') {
-				echo '<br><a href="', $url, '&amp;show=indi">', I18N::translate('Show the list of individuals'), '</a>';
-			} else {
-				echo '<br><a href="', $url, '&amp;show=surn">', I18N::translate('Show the list of surnames'), '</a>';
-			}
-		}
-	}
-	echo '</p>';
+        if ($alpha !== '@' && $alpha !== ',' && !$surname) {
+            if ($show === 'surn') {
+                echo '<br><a href="', $url, '&amp;show=indi">', I18N::translate('Show the list of individuals'), '</a>';
+            } else {
+                echo '<br><a href="', $url, '&amp;show=surn">', I18N::translate('Show the list of surnames'), '</a>';
+            }
+        }
+    }
+    echo '</p>';
 }
 
 if ($show === 'indi' || $show === 'surn') {
-	$surns = QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', true);
-	if ($show === 'surn') {
-		// Show the surname list
-		switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		}
-	} else {
-		// Show the list
-		$count = 0;
-		foreach ($surns as $surnames) {
-			foreach ($surnames as $list) {
-				$count += count($list);
-			}
-		}
-		// Don't sublists short lists.
-		if ($count < $WT_TREE->getPreference('SUBLIST_TRIGGER_I')) {
-			$falpha              = '';
-			$show_all_firstnames = 'no';
-		} else {
-			$givn_initials = QueryName::givenAlpha($WT_TREE, $surname, $alpha, $show_marnm === 'yes', true);
-			// Break long lists by initial letter of given name
-			if ($surname || $show_all === 'yes') {
-				// Don't show the list until we have some filter criteria
-				$show = ($falpha || $show_all_firstnames === 'yes') ? 'indi' : 'none';
-				$list = array();
-				foreach ($givn_initials as $givn_initial => $count) {
-					switch ($givn_initial) {
-					case '@':
-						$html = I18N::translateContext('Unknown given name', '…');
-						break;
-					default:
-						$html = Filter::escapeHtml($givn_initial);
-						break;
-					}
-					if ($count) {
-						if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {
-							$list[] = '<a class="warning" href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
-						} else {
-							$list[] = '<a href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
-						}
-					} else {
-						$list[] = $html;
-					}
-				}
-				// Search spiders don't get the "show all" option as the other links give them everything.
-				if (!Auth::isSearchEngine()) {
-					if ($show_all_firstnames === 'yes') {
-						$list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
-					} else {
-						$list[] = '<a href="' . $url . '&amp;show_all_firstnames=yes">' . I18N::translate('All') . '</a>';
-					}
-				}
-				if ($show_all === 'no') {
-					echo '<h2 class="center">', I18N::translate('Individuals with surname %s', $legend), '</h2>';
-				}
-				echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
-			}
-		}
-		if ($show === 'indi') {
-			echo FunctionsPrintLists::familyTable(QueryName::families($WT_TREE, $surname, $alpha, $falpha, $show_marnm === 'yes'));
-		}
-	}
+    $surns = QueryName::surnames($WT_TREE, $surname, $alpha, $show_marnm === 'yes', true);
+    if ($show === 'surn') {
+        // Show the surname list
+        switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
+        case 'style1':
+            echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
+            break;
+        case 'style3':
+            echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
+            break;
+        case 'style2':
+        default:
+            echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
+            break;
+        }
+    } else {
+        // Show the list
+        $count = 0;
+        foreach ($surns as $surnames) {
+            foreach ($surnames as $list) {
+                $count += count($list);
+            }
+        }
+        // Don't sublists short lists.
+        if ($count < $WT_TREE->getPreference('SUBLIST_TRIGGER_I')) {
+            $falpha              = '';
+            $show_all_firstnames = 'no';
+        } else {
+            $givn_initials = QueryName::givenAlpha($WT_TREE, $surname, $alpha, $show_marnm === 'yes', true);
+            // Break long lists by initial letter of given name
+            if ($surname || $show_all === 'yes') {
+                // Don't show the list until we have some filter criteria
+                $show = ($falpha || $show_all_firstnames === 'yes') ? 'indi' : 'none';
+                $list = array();
+                foreach ($givn_initials as $givn_initial => $count) {
+                    switch ($givn_initial) {
+                    case '@':
+                        $html = I18N::translateContext('Unknown given name', '…');
+                        break;
+                    default:
+                        $html = Filter::escapeHtml($givn_initial);
+                        break;
+                    }
+                    if ($count) {
+                        if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {
+                            $list[] = '<a class="warning" href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+                        } else {
+                            $list[] = '<a href="' . $url . '&amp;falpha=' . rawurlencode($givn_initial) . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+                        }
+                    } else {
+                        $list[] = $html;
+                    }
+                }
+                // Search spiders don't get the "show all" option as the other links give them everything.
+                if (!Auth::isSearchEngine()) {
+                    if ($show_all_firstnames === 'yes') {
+                        $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+                    } else {
+                        $list[] = '<a href="' . $url . '&amp;show_all_firstnames=yes">' . I18N::translate('All') . '</a>';
+                    }
+                }
+                if ($show_all === 'no') {
+                    echo '<h2 class="center">', I18N::translate('Individuals with surname %s', $legend), '</h2>';
+                }
+                echo '<p class="center alpha_index">', implode(' | ', $list), '</p>';
+            }
+        }
+        if ($show === 'indi') {
+            echo FunctionsPrintLists::familyTable(QueryName::families($WT_TREE, $surname, $alpha, $falpha, $show_marnm === 'yes'));
+        }
+    }
 }

Switch Indentation +41 added lines, -41 removed lines

@@ -46,12 +46,12 @@ 
 
 $show_marnm = Filter::get('show_marnm', 'no|yes');
 switch ($show_marnm) {
-case 'no':
-case 'yes':
-	Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
-	break;
-default:
-	$show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
+    case 'no':
+    case 'yes':
+	    Auth::user()->setPreference(WT_SCRIPT_NAME . '_show_marnm', $show_marnm);
+	    break;
+    default:
+	    $show_marnm = Auth::user()->getPreference(WT_SCRIPT_NAME . '_show_marnm');
 }
 
 // Make sure selections are consistent.
@@ -91,16 +91,16 @@ 
 	}
 	$url = WT_SCRIPT_NAME . '?surname=' . rawurlencode($surname) . '&ged=' . $WT_TREE->getNameUrl();
 	switch ($falpha) {
-	case '':
-		break;
-	case '@':
-		$legend .= ', ' . I18N::translateContext('Unknown given name', '…');
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
-	default:
-		$legend .= ', ' . Filter::escapeHtml($falpha) . '…';
-		$url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
-		break;
+	    case '':
+		    break;
+	    case '@':
+		    $legend .= ', ' . I18N::translateContext('Unknown given name', '…');
+		    $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+		    break;
+	    default:
+		    $legend .= ', ' . Filter::escapeHtml($falpha) . '…';
+		    $url .= '&falpha=' . rawurlencode($falpha) . '&ged=' . $WT_TREE->getNameUrl();
+		    break;
 	}
 	$show = 'indi'; // SURN list makes no sense here
 } elseif ($alpha === '@') {
@@ -136,15 +136,15 @@ 
 $list = array();
 foreach (QueryName::surnameAlpha($WT_TREE, $show_marnm === 'yes', true) as $letter => $count) {
 	switch ($letter) {
-	case '@':
-		$html = I18N::translateContext('Unknown surname', '…');
-		break;
-	case ',':
-		$html = I18N::translate('None');
-		break;
-	default:
-		$html = Filter::escapeHtml($letter);
-		break;
+	    case '@':
+		    $html = I18N::translateContext('Unknown surname', '…');
+		    break;
+	    case ',':
+		    $html = I18N::translate('None');
+		    break;
+	    default:
+		    $html = Filter::escapeHtml($letter);
+		    break;
 	}
 	if ($count) {
 		if ($letter == $alpha) {
@@ -194,16 +194,16 @@ 
 	if ($show === 'surn') {
 		// Show the surname list
 		switch ($WT_TREE->getPreference('SURNAME_LIST_STYLE')) {
-		case 'style1':
-			echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
-			break;
-		case 'style3':
-			echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
-			break;
-		case 'style2':
-		default:
-			echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
-			break;
+		    case 'style1':
+			    echo FunctionsPrintLists::surnameList($surns, 3, true, WT_SCRIPT_NAME, $WT_TREE);
+			    break;
+		    case 'style3':
+			    echo FunctionsPrintLists::surnameTagCloud($surns, WT_SCRIPT_NAME, true, $WT_TREE);
+			    break;
+		    case 'style2':
+		    default:
+			    echo FunctionsPrintLists::surnameTable($surns, WT_SCRIPT_NAME, $WT_TREE);
+			    break;
 		}
 	} else {
 		// Show the list
@@ -226,12 +226,12 @@ 
 				$list = array();
 				foreach ($givn_initials as $givn_initial => $count) {
 					switch ($givn_initial) {
-					case '@':
-						$html = I18N::translateContext('Unknown given name', '…');
-						break;
-					default:
-						$html = Filter::escapeHtml($givn_initial);
-						break;
+					    case '@':
+						    $html = I18N::translateContext('Unknown given name', '…');
+						    break;
+					    default:
+						    $html = Filter::escapeHtml($givn_initial);
+						    break;
 					}
 					if ($count) {
 						if ($show === 'indi' && $givn_initial === $falpha && $show_all_firstnames === 'no') {

note.php

Indentation +39 added lines, -39 removed lines

@@ -35,34 +35,34 @@ 
 $controller = new NoteController($record);
 
 if ($controller->record && $controller->record->canShow()) {
-	if ($controller->record->isPendingDeletion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This note has been deleted. You should review the deletion and then %1$s or %2$s it.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This note has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	} elseif ($controller->record->isPendingAddtion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This note has been edited. You should review the changes and then %1$s or %2$s them.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This note has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	}
-	$controller->pageHeader();
+    if ($controller->record->isPendingDeletion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This note has been deleted. You should review the deletion and then %1$s or %2$s it.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This note has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    } elseif ($controller->record->isPendingAddtion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This note has been edited. You should review the changes and then %1$s or %2$s them.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This note has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    }
+    $controller->pageHeader();
 } else {
-	FlashMessages::addMessage(I18N::translate('This note does not exist or you do not have permission to view it.'), 'danger');
-	http_response_code(404);
-	$controller->pageHeader();
+    FlashMessages::addMessage(I18N::translate('This note does not exist or you do not have permission to view it.'), 'danger');
+    http_response_code(404);
+    $controller->pageHeader();
 
-	return;
+    return;
 }
 
 $controller->addInlineJavascript('
@@ -82,16 +82,16 @@ 
 
 $facts = array();
 foreach ($controller->record->getFacts() as $fact) {
-	if ($fact->getTag() != 'CONT') {
-		$facts[] = $fact;
-	}
+    if ($fact->getTag() != 'CONT') {
+        $facts[] = $fact;
+    }
 }
 
 // Legacy formatting, created by the census assistant
 if (Module::getModuleByName('GEDFact_assistant')) {
-	$text = CensusAssistantModule::formatCensusNote($controller->record);
+    $text = CensusAssistantModule::formatCensusNote($controller->record);
 } else {
-	$text = Filter::formatText($controller->record->getNote(), $controller->record->getTree());
+    $text = Filter::formatText($controller->record->getNote(), $controller->record->getTree());
 }
 
 ?>
@@ -165,14 +165,14 @@ 
 					<td class="optionbox wrap width80"><?php echo $text; ?></td>
 				</tr>
 				<?php
-				foreach ($facts as $fact) {
-					FunctionsPrintFacts::printFact($fact, $controller->record);
-				}
-
-				if ($controller->record->canEdit()) {
-				FunctionsPrint::printAddNewFact($controller->record->getXref(), $facts, 'NOTE');
-				}
-				?>
+                foreach ($facts as $fact) {
+                    FunctionsPrintFacts::printFact($fact, $controller->record);
+                }
+
+                if ($controller->record->canEdit()) {
+                FunctionsPrint::printAddNewFact($controller->record->getXref(), $facts, 'NOTE');
+                }
+                ?>
 			</table>
 		</div>
 

module.php

Indentation +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@
 $module     = Module::getModuleByName($mod);
 
 if ($module) {
-	$module->modAction($mod_action);
+    $module->modAction($mod_action);
 } else {
-	header('Location: ' . WT_BASE_URL);
+    header('Location: ' . WT_BASE_URL);
 }

admin_site_merge.php

Indentation +110 added lines, -110 removed lines

@@ -31,10 +31,10 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Merge records') . ' — ' . $WT_TREE->getTitleHtml())
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();');
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Merge records') . ' — ' . $WT_TREE->getTitleHtml())
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();');
 
 $gid1  = Filter::post('gid1', WT_REGEX_XREF, Filter::get('gid1', WT_REGEX_XREF));
 $gid2  = Filter::post('gid2', WT_REGEX_XREF, Filter::get('gid2', WT_REGEX_XREF));
@@ -44,19 +44,19 @@ 
 $rec2  = GedcomRecord::getInstance($gid2, $WT_TREE);
 
 if ($gid1 && !$rec1) {
-	FlashMessages::addMessage(I18N::translate('%1$s does not exist.', $gid1), 'danger');
+    FlashMessages::addMessage(I18N::translate('%1$s does not exist.', $gid1), 'danger');
 }
 
 if ($gid2 && !$rec2) {
-	FlashMessages::addMessage(I18N::translate('%1$s does not exist.', $gid2), 'danger');
+    FlashMessages::addMessage(I18N::translate('%1$s does not exist.', $gid2), 'danger');
 }
 
 if ($rec1 && $rec2 && $rec1->getXref() === $rec2->getXref()) {
-	FlashMessages::addMessage(I18N::translate('You entered the same IDs. You cannot merge the same records.'), 'danger');
+    FlashMessages::addMessage(I18N::translate('You entered the same IDs. You cannot merge the same records.'), 'danger');
 }
 
 if ($rec1 && $rec2 && $rec1::RECORD_TYPE !== $rec2::RECORD_TYPE) {
-	FlashMessages::addMessage(I18N::translate('Records are not the same type. Cannot merge records that are not the same type.'), 'danger');
+    FlashMessages::addMessage(I18N::translate('Records are not the same type. Cannot merge records that are not the same type.'), 'danger');
 }
 
 // Facts found both records
@@ -66,117 +66,117 @@ 
 $facts2 = array();
 
 if ($rec1) {
-	foreach ($rec1->getFacts() as $fact) {
-		if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') {
-			$facts1[$fact->getFactId()] = $fact;
-		}
-	}
+    foreach ($rec1->getFacts() as $fact) {
+        if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') {
+            $facts1[$fact->getFactId()] = $fact;
+        }
+    }
 }
 
 if ($rec2) {
-	foreach ($rec2->getFacts() as $fact) {
-		if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') {
-			$facts2[$fact->getFactId()] = $fact;
-		}
-	}
+    foreach ($rec2->getFacts() as $fact) {
+        if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') {
+            $facts2[$fact->getFactId()] = $fact;
+        }
+    }
 }
 
 foreach ($facts1 as $id1 => $fact1) {
-	foreach ($facts2 as $id2 => $fact2) {
-		if ($fact1->getFactId() === $fact2->getFactId()) {
-			$facts[] = $fact1;
-			unset($facts1[$id1]);
-			unset($facts2[$id2]);
-		}
-	}
+    foreach ($facts2 as $id2 => $fact2) {
+        if ($fact1->getFactId() === $fact2->getFactId()) {
+            $facts[] = $fact1;
+            unset($facts1[$id1]);
+            unset($facts2[$id2]);
+        }
+    }
 }
 
 if ($rec1 && $rec2 && $rec1->getXref() !== $rec2->getXref() && $rec1::RECORD_TYPE === $rec2::RECORD_TYPE && Filter::post('action') === 'merge' && Filter::checkCsrf()) {
-	// Use the XREF of the record.
-	$gid1 = $rec1->getXref();
-	$gid2 = $rec2->getXref();
-
-	$ids = FunctionsDb::fetchAllLinks($gid2, $WT_TREE->getTreeId());
-
-	// If we are not auto-accepting, then we can show a link to the pending deletion
-	if (Auth::user()->getPreference('auto_accept')) {
-		$record2_name = $rec2->getFullName();
-	} else {
-		$record2_name = '<a class="alert-link" href="' . $rec2->getHtmlUrl() . '">' . $rec2->getFullName() . '</a>';
-	}
-
-	foreach ($ids as $id) {
-		$record = GedcomRecord::getInstance($id, $WT_TREE);
-		if (!$record->isPendingDeletion()) {
-			FlashMessages::addMessage(I18N::translate(
-				/* I18N: The placeholders are the names of individuals, sources, etc. */
-				'The link from “%1$s” to “%2$s” has been updated.',
-					'<a class="alert-link" href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a>',
-					$record2_name
-			), 'info');
-			$gedcom = str_replace("@$gid2@", "@$gid1@", $record->getGedcom());
-			$gedcom = preg_replace(
-				'/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))((?:\n1.*(?:\n[2-9].*)*)*\1)/',
-				'$2',
-				$gedcom
-			);
-			$record->updateRecord($gedcom, true);
-		}
-	}
-	// Update any linked user-accounts
-	Database::prepare(
-		"UPDATE `##user_gedcom_setting`" .
-		" SET setting_value=?" .
-		" WHERE gedcom_id=? AND setting_name='gedcomid' AND setting_value=?"
-	)->execute(array($gid2, $WT_TREE->getTreeId(), $gid1));
-
-	// Merge hit counters
-	$hits = Database::prepare(
-		"SELECT page_name, SUM(page_count)" .
-		" FROM `##hit_counter`" .
-		" WHERE gedcom_id=? AND page_parameter IN (?, ?)" .
-		" GROUP BY page_name"
-	)->execute(array($WT_TREE->getTreeId(), $gid1, $gid2))->fetchAssoc();
-
-	foreach ($hits as $page_name => $page_count) {
-		Database::prepare(
-			"UPDATE `##hit_counter` SET page_count=?" .
-			" WHERE gedcom_id=? AND page_name=? AND page_parameter=?"
-		)->execute(array($page_count, $WT_TREE->getTreeId(), $page_name, $gid1));
-	}
-	Database::prepare(
-		"DELETE FROM `##hit_counter`" .
-		" WHERE gedcom_id=? AND page_parameter=?"
-	)->execute(array($WT_TREE->getTreeId(), $gid2));
-
-	$gedcom = "0 @" . $rec1->getXref() . "@ " . $rec1::RECORD_TYPE;
-	foreach ($facts as $fact_id => $fact) {
-		$gedcom .= "\n" . $fact->getGedcom();
-	}
-	foreach ($facts1 as $fact_id => $fact) {
-		if (in_array($fact_id, $keep1)) {
-			$gedcom .= "\n" . $fact->getGedcom();
-		}
-	}
-	foreach ($facts2 as $fact_id => $fact) {
-		if (in_array($fact_id, $keep2)) {
-			$gedcom .= "\n" . $fact->getGedcom();
-		}
-	}
-
-	$rec1->updateRecord($gedcom, true);
-	$rec2->deleteRecord();
-	FunctionsDb::updateFavorites($gid2, $gid1, $WT_TREE);
-	FlashMessages::addMessage(I18N::translate(
-	/* I18N: Records are individuals, sources, etc. */
-		'The records “%1$s” and “%2$s” have been merged.',
-		'<a class="alert-link" href="' . $rec1->getHtmlUrl() . '">' . $rec1->getFullName() . '</a>',
-		$record2_name
-	), 'success');
-
-	header('Location: ' . WT_BASE_URL . Filter::post('url', 'admin_trees_duplicates\.php', WT_SCRIPT_NAME));
-
-	return;
+    // Use the XREF of the record.
+    $gid1 = $rec1->getXref();
+    $gid2 = $rec2->getXref();
+
+    $ids = FunctionsDb::fetchAllLinks($gid2, $WT_TREE->getTreeId());
+
+    // If we are not auto-accepting, then we can show a link to the pending deletion
+    if (Auth::user()->getPreference('auto_accept')) {
+        $record2_name = $rec2->getFullName();
+    } else {
+        $record2_name = '<a class="alert-link" href="' . $rec2->getHtmlUrl() . '">' . $rec2->getFullName() . '</a>';
+    }
+
+    foreach ($ids as $id) {
+        $record = GedcomRecord::getInstance($id, $WT_TREE);
+        if (!$record->isPendingDeletion()) {
+            FlashMessages::addMessage(I18N::translate(
+                /* I18N: The placeholders are the names of individuals, sources, etc. */
+                'The link from “%1$s” to “%2$s” has been updated.',
+                    '<a class="alert-link" href="' . $record->getHtmlUrl() . '">' . $record->getFullName() . '</a>',
+                    $record2_name
+            ), 'info');
+            $gedcom = str_replace("@$gid2@", "@$gid1@", $record->getGedcom());
+            $gedcom = preg_replace(
+                '/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))((?:\n1.*(?:\n[2-9].*)*)*\1)/',
+                '$2',
+                $gedcom
+            );
+            $record->updateRecord($gedcom, true);
+        }
+    }
+    // Update any linked user-accounts
+    Database::prepare(
+        "UPDATE `##user_gedcom_setting`" .
+        " SET setting_value=?" .
+        " WHERE gedcom_id=? AND setting_name='gedcomid' AND setting_value=?"
+    )->execute(array($gid2, $WT_TREE->getTreeId(), $gid1));
+
+    // Merge hit counters
+    $hits = Database::prepare(
+        "SELECT page_name, SUM(page_count)" .
+        " FROM `##hit_counter`" .
+        " WHERE gedcom_id=? AND page_parameter IN (?, ?)" .
+        " GROUP BY page_name"
+    )->execute(array($WT_TREE->getTreeId(), $gid1, $gid2))->fetchAssoc();
+
+    foreach ($hits as $page_name => $page_count) {
+        Database::prepare(
+            "UPDATE `##hit_counter` SET page_count=?" .
+            " WHERE gedcom_id=? AND page_name=? AND page_parameter=?"
+        )->execute(array($page_count, $WT_TREE->getTreeId(), $page_name, $gid1));
+    }
+    Database::prepare(
+        "DELETE FROM `##hit_counter`" .
+        " WHERE gedcom_id=? AND page_parameter=?"
+    )->execute(array($WT_TREE->getTreeId(), $gid2));
+
+    $gedcom = "0 @" . $rec1->getXref() . "@ " . $rec1::RECORD_TYPE;
+    foreach ($facts as $fact_id => $fact) {
+        $gedcom .= "\n" . $fact->getGedcom();
+    }
+    foreach ($facts1 as $fact_id => $fact) {
+        if (in_array($fact_id, $keep1)) {
+            $gedcom .= "\n" . $fact->getGedcom();
+        }
+    }
+    foreach ($facts2 as $fact_id => $fact) {
+        if (in_array($fact_id, $keep2)) {
+            $gedcom .= "\n" . $fact->getGedcom();
+        }
+    }
+
+    $rec1->updateRecord($gedcom, true);
+    $rec2->deleteRecord();
+    FunctionsDb::updateFavorites($gid2, $gid1, $WT_TREE);
+    FlashMessages::addMessage(I18N::translate(
+    /* I18N: Records are individuals, sources, etc. */
+        'The records “%1$s” and “%2$s” have been merged.',
+        '<a class="alert-link" href="' . $rec1->getHtmlUrl() . '">' . $rec1->getFullName() . '</a>',
+        $record2_name
+    ), 'success');
+
+    header('Location: ' . WT_BASE_URL . Filter::post('url', 'admin_trees_duplicates\.php', WT_SCRIPT_NAME));
+
+    return;
 }
 
 $controller->pageHeader();

Braces +20 added lines, -8 removed lines

@@ -236,9 +236,12 @@ 
 				<?php endforeach; ?>
 				</tbody>
 			</table>
-			<?php else: ?>
+			<?php else {
+    : ?>
 			<p>
-				<?php echo I18N::translate('No matching facts found'); ?>
+				<?php echo I18N::translate('No matching facts found');
+}
+?>
 			</p>
 			<?php endif; ?>
 		</div>
@@ -283,9 +286,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+    : ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -329,9 +335,12 @@ 
 							<?php endforeach; ?>
 							</tbody>
 						</table>
-					<?php else: ?>
+					<?php else {
+    : ?>
 						<p>
-							<?php echo I18N::translate('No matching facts found'); ?>
+							<?php echo I18N::translate('No matching facts found');
+}
+?>
 						</p>
 					<?php endif; ?>
 				</div>
@@ -345,10 +354,13 @@ 
 	</button>
 </form>
 
-<?php else: ?>
+<?php else {
+    : ?>
 
 <form class="form form-horizontal">
-	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
+	<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml();
+}
+?>">
 	<p><?php echo /* I18N: Records are indviduals, sources, etc. */ I18N::translate('Select two records to merge.'); ?></p>
 
 	<div class="form-group">

admin.php

Braces +35 added lines, -14 removed lines

@@ -633,8 +633,11 @@ 
 					<a href="admin_site_upgrade.php" class="error">
 						<?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
 					</a>
-					<?php else: ?>
-						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.'); ?>
+					<?php else {
+    : ?>
+						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.');
+}
+?>
 					<?php endif; ?>
 				</p>
 				<?php endif; ?>
@@ -796,9 +799,12 @@ 
 									<?php echo I18N::number($changes[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+    : ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($individuals[$tree->getTreeId()]): ?>
@@ -806,9 +812,12 @@ 
 									<?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+    : ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($families[$tree->getTreeId()]): ?>
@@ -816,9 +825,12 @@ 
 									<?php echo I18N::number($families[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+    : ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($sources[$tree->getTreeId()]): ?>
@@ -826,9 +838,12 @@ 
 									<?php echo I18N::number($sources[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+    : ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($repositories[$tree->getTreeId()]): ?>
@@ -836,9 +851,12 @@ 
 									<?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+    : ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($media[$tree->getTreeId()]): ?>
@@ -846,9 +864,12 @@ 
 									<?php echo I18N::number($media[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+    : ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 						</tr>
 						<?php endforeach; ?>

Indentation +473 added lines, -473 removed lines

@@ -33,462 +33,462 @@ 
 // It was generated with the help of a command like this:
 // git diff 1.6.0..master --name-status | grep ^D
 $old_files = array(
-	// Removed in 1.0.2
-	WT_ROOT . 'language/en.mo',
-	// Removed in 1.0.3
-	WT_ROOT . 'themechange.php',
-	// Removed in 1.0.4
-	// Removed in 1.0.5
-	// Removed in 1.0.6
-	WT_ROOT . 'includes/extras',
-	// Removed in 1.1.0
-	WT_ROOT . 'addremotelink.php',
-	WT_ROOT . 'addsearchlink.php',
-	WT_ROOT . 'client.php',
-	WT_ROOT . 'dir_editor.php',
-	WT_ROOT . 'editconfig_gedcom.php',
-	WT_ROOT . 'editgedcoms.php',
-	WT_ROOT . 'edit_merge.php',
-	WT_ROOT . 'genservice.php',
-	WT_ROOT . 'includes/classes',
-	WT_ROOT . 'includes/controllers',
-	WT_ROOT . 'includes/family_nav.php',
-	WT_ROOT . 'logs.php',
-	WT_ROOT . 'manageservers.php',
-	WT_ROOT . 'media.php',
-	WT_ROOT . 'module_admin.php',
-	//WT_ROOT.'modules', // Do not delete - users may have stored custom modules/data here
-	WT_ROOT . 'opensearch.php',
-	WT_ROOT . 'PEAR.php',
-	WT_ROOT . 'pgv_to_wt.php',
-	WT_ROOT . 'places',
-	//WT_ROOT.'robots.txt', // Do not delete this - it may contain user data
-	WT_ROOT . 'serviceClientTest.php',
-	WT_ROOT . 'siteconfig.php',
-	WT_ROOT . 'SOAP',
-	WT_ROOT . 'themes/clouds/mozilla.css',
-	WT_ROOT . 'themes/clouds/netscape.css',
-	WT_ROOT . 'themes/colors/mozilla.css',
-	WT_ROOT . 'themes/colors/netscape.css',
-	WT_ROOT . 'themes/fab/mozilla.css',
-	WT_ROOT . 'themes/fab/netscape.css',
-	WT_ROOT . 'themes/minimal/mozilla.css',
-	WT_ROOT . 'themes/minimal/netscape.css',
-	WT_ROOT . 'themes/webtrees/mozilla.css',
-	WT_ROOT . 'themes/webtrees/netscape.css',
-	WT_ROOT . 'themes/webtrees/style_rtl.css',
-	WT_ROOT . 'themes/xenea/mozilla.css',
-	WT_ROOT . 'themes/xenea/netscape.css',
-	WT_ROOT . 'uploadmedia.php',
-	WT_ROOT . 'useradmin.php',
-	WT_ROOT . 'webservice',
-	WT_ROOT . 'wtinfo.php',
-	// Removed in 1.1.1
-	// Removed in 1.1.2
-	WT_ROOT . 'treenav.php',
-	// Removed in 1.2.0
-	WT_ROOT . 'themes/clouds/jquery',
-	WT_ROOT . 'themes/colors/jquery',
-	WT_ROOT . 'themes/fab/jquery',
-	WT_ROOT . 'themes/minimal/jquery',
-	WT_ROOT . 'themes/webtrees/jquery',
-	WT_ROOT . 'themes/xenea/jquery',
-	// Removed in 1.2.1
-	// Removed in 1.2.2
-	WT_ROOT . 'themes/clouds/chrome.css',
-	WT_ROOT . 'themes/clouds/opera.css',
-	WT_ROOT . 'themes/clouds/print.css',
-	WT_ROOT . 'themes/clouds/style_rtl.css',
-	WT_ROOT . 'themes/colors/chrome.css',
-	WT_ROOT . 'themes/colors/opera.css',
-	WT_ROOT . 'themes/colors/print.css',
-	WT_ROOT . 'themes/colors/style_rtl.css',
-	WT_ROOT . 'themes/fab/chrome.css',
-	WT_ROOT . 'themes/fab/opera.css',
-	WT_ROOT . 'themes/minimal/chrome.css',
-	WT_ROOT . 'themes/minimal/opera.css',
-	WT_ROOT . 'themes/minimal/print.css',
-	WT_ROOT . 'themes/minimal/style_rtl.css',
-	WT_ROOT . 'themes/xenea/chrome.css',
-	WT_ROOT . 'themes/xenea/opera.css',
-	WT_ROOT . 'themes/xenea/print.css',
-	WT_ROOT . 'themes/xenea/style_rtl.css',
-	// Removed in 1.2.3
-	//WT_ROOT.'modules_v2', // Do not delete - users may have stored custom modules/data here
-	// Removed in 1.2.4
-	WT_ROOT . 'includes/cssparser.inc.php',
-	WT_ROOT . 'modules_v3/gedcom_favorites/help_text.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_3_find.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_3_search_add.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_5_input.js',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_5_input.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_query_1a.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_query_2a.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_query_3a.php',
-	WT_ROOT . 'modules_v3/lightbox/css/album_page_RTL2.css',
-	WT_ROOT . 'modules_v3/lightbox/css/album_page_RTL.css',
-	WT_ROOT . 'modules_v3/lightbox/css/album_page_RTL_ff.css',
-	WT_ROOT . 'modules_v3/lightbox/css/clearbox_music.css',
-	WT_ROOT . 'modules_v3/lightbox/css/clearbox_music_RTL.css',
-	WT_ROOT . 'modules_v3/user_favorites/db_schema',
-	WT_ROOT . 'modules_v3/user_favorites/help_text.php',
-	WT_ROOT . 'search_engine.php',
-	WT_ROOT . 'themes/clouds/modules.css',
-	WT_ROOT . 'themes/colors/modules.css',
-	WT_ROOT . 'themes/fab/modules.css',
-	WT_ROOT . 'themes/minimal/modules.css',
-	WT_ROOT . 'themes/webtrees/modules.css',
-	WT_ROOT . 'themes/xenea/modules.css',
-	// Removed in 1.2.5
-	WT_ROOT . 'includes/media_reorder_count.php',
-	WT_ROOT . 'includes/media_tab_head.php',
-	WT_ROOT . 'modules_v3/clippings/index.php',
-	WT_ROOT . 'modules_v3/googlemap/css/googlemap_style.css',
-	WT_ROOT . 'modules_v3/googlemap/css/wt_v3_places_edit.css',
-	WT_ROOT . 'modules_v3/googlemap/index.php',
-	WT_ROOT . 'modules_v3/lightbox/index.php',
-	WT_ROOT . 'modules_v3/recent_changes/help_text.php',
-	WT_ROOT . 'modules_v3/todays_events/help_text.php',
-	WT_ROOT . 'sidebar.php',
-	// Removed in 1.2.6
-	WT_ROOT . 'modules_v3/sitemap/admin_index.php',
-	WT_ROOT . 'modules_v3/sitemap/help_text.php',
-	WT_ROOT . 'modules_v3/tree/css/styles',
-	WT_ROOT . 'modules_v3/tree/css/treebottom.gif',
-	WT_ROOT . 'modules_v3/tree/css/treebottomleft.gif',
-	WT_ROOT . 'modules_v3/tree/css/treebottomright.gif',
-	WT_ROOT . 'modules_v3/tree/css/tree.jpg',
-	WT_ROOT . 'modules_v3/tree/css/treeleft.gif',
-	WT_ROOT . 'modules_v3/tree/css/treeright.gif',
-	WT_ROOT . 'modules_v3/tree/css/treetop.gif',
-	WT_ROOT . 'modules_v3/tree/css/treetopleft.gif',
-	WT_ROOT . 'modules_v3/tree/css/treetopright.gif',
-	WT_ROOT . 'modules_v3/tree/css/treeview_print.css',
-	WT_ROOT . 'modules_v3/tree/help_text.php',
-	WT_ROOT . 'modules_v3/tree/images/print.png',
-	// Removed in 1.2.7
-	WT_ROOT . 'login_register.php',
-	WT_ROOT . 'modules_v3/top10_givnnames/help_text.php',
-	WT_ROOT . 'modules_v3/top10_surnames/help_text.php',
-	// Removed in 1.3.0
-	WT_ROOT . 'admin_site_ipaddress.php',
-	WT_ROOT . 'downloadgedcom.php',
-	WT_ROOT . 'export_gedcom.php',
-	WT_ROOT . 'gedcheck.php',
-	WT_ROOT . 'images',
-	WT_ROOT . 'includes/dmsounds_UTF8.php',
-	WT_ROOT . 'includes/grampsxml.rng',
-	WT_ROOT . 'includes/session_spider.php',
-	WT_ROOT . 'modules_v3/googlemap/admin_editconfig.php',
-	WT_ROOT . 'modules_v3/googlemap/admin_placecheck.php',
-	WT_ROOT . 'modules_v3/googlemap/flags.php',
-	WT_ROOT . 'modules_v3/googlemap/images/pedigree_map.gif',
-	WT_ROOT . 'modules_v3/googlemap/pedigree_map.php',
-	WT_ROOT . 'modules_v3/lightbox/admin_config.php',
-	WT_ROOT . 'modules_v3/lightbox/album.php',
-	WT_ROOT . 'modules_v3/tree/css/vline.jpg',
-	// Removed in 1.3.1
-	WT_ROOT . 'imageflush.php',
-	WT_ROOT . 'modules_v3/googlemap/wt_v3_pedigree_map.js.php',
-	WT_ROOT . 'modules_v3/lightbox/js/tip_balloon_RTL.js',
-	// Removed in 1.3.2
-	WT_ROOT . 'includes/set_gedcom_defaults.php',
-	WT_ROOT . 'modules_v3/address_report',
-	WT_ROOT . 'modules_v3/lightbox/functions/lb_horiz_sort.php',
-	WT_ROOT . 'modules_v3/random_media/help_text.php',
-	// Removed in 1.4.0
-	WT_ROOT . 'imageview.php',
-	WT_ROOT . 'media/MediaInfo.txt',
-	WT_ROOT . 'media/thumbs/ThumbsInfo.txt',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/css/media_0_inverselink.css',
-	WT_ROOT . 'modules_v3/lightbox/help_text.php',
-	WT_ROOT . 'modules_v3/lightbox/images/blank.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/close_1.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/image_add.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/image_copy.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/image_delete.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/image_edit.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/image_link.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/images.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/image_view.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/loading.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/next.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/nextlabel.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/norm_2.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/overlay.png',
-	WT_ROOT . 'modules_v3/lightbox/images/prev.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/prevlabel.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/private.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/slideshow.jpg',
-	WT_ROOT . 'modules_v3/lightbox/images/transp80px.gif',
-	WT_ROOT . 'modules_v3/lightbox/images/zoom_1.gif',
-	WT_ROOT . 'modules_v3/lightbox/js',
-	WT_ROOT . 'modules_v3/lightbox/music',
-	WT_ROOT . 'modules_v3/lightbox/pic',
-	WT_ROOT . 'themes/_administration/jquery',
-	WT_ROOT . 'themes/webtrees/chrome.css',
-	// Removed in 1.4.1
-	WT_ROOT . 'modules_v3/lightbox/images/image_edit.png',
-	WT_ROOT . 'modules_v3/lightbox/images/image_view.png',
-	// Removed in 1.4.2
-	WT_ROOT . 'modules_v3/lightbox/images/image_view.png',
-	WT_ROOT . 'modules_v3/top10_pageviews/help_text.php',
-	WT_ROOT . 'themes/_administration/jquery-ui-1.10.0',
-	WT_ROOT . 'themes/clouds/jquery-ui-1.10.0',
-	WT_ROOT . 'themes/colors/jquery-ui-1.10.0',
-	WT_ROOT . 'themes/fab/jquery-ui-1.10.0',
-	WT_ROOT . 'themes/minimal/jquery-ui-1.10.0',
-	WT_ROOT . 'themes/webtrees/jquery-ui-1.10.0',
-	WT_ROOT . 'themes/xenea/jquery-ui-1.10.0',
-	// Removed in 1.5.0
-	WT_ROOT . 'includes/media_reorder.php',
-	WT_ROOT . 'includes/old_messages.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_CENS/census_note_decode.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_CENS/census_asst_date.php',
-	WT_ROOT . 'modules_v3/googlemap/wt_v3_googlemap.js.php',
-	WT_ROOT . 'modules_v3/lightbox/functions/lightbox_print_media.php',
-	WT_ROOT . 'modules_v3/upcoming_events/help_text.php',
-	WT_ROOT . 'modules_v3/stories/help_text.php',
-	WT_ROOT . 'modules_v3/user_messages/help_text.php',
-	WT_ROOT . 'themes/_administration/favicon.png',
-	WT_ROOT . 'themes/_administration/images',
-	WT_ROOT . 'themes/_administration/msie.css',
-	WT_ROOT . 'themes/_administration/style.css',
-	WT_ROOT . 'themes/clouds/favicon.png',
-	WT_ROOT . 'themes/clouds/images',
-	WT_ROOT . 'themes/clouds/msie.css',
-	WT_ROOT . 'themes/clouds/style.css',
-	WT_ROOT . 'themes/colors/css',
-	WT_ROOT . 'themes/colors/favicon.png',
-	WT_ROOT . 'themes/colors/images',
-	WT_ROOT . 'themes/colors/ipad.css',
-	WT_ROOT . 'themes/colors/msie.css',
-	WT_ROOT . 'themes/fab/favicon.png',
-	WT_ROOT . 'themes/fab/images',
-	WT_ROOT . 'themes/fab/msie.css',
-	WT_ROOT . 'themes/fab/style.css',
-	WT_ROOT . 'themes/minimal/favicon.png',
-	WT_ROOT . 'themes/minimal/images',
-	WT_ROOT . 'themes/minimal/msie.css',
-	WT_ROOT . 'themes/minimal/style.css',
-	WT_ROOT . 'themes/webtrees/favicon.png',
-	WT_ROOT . 'themes/webtrees/images',
-	WT_ROOT . 'themes/webtrees/msie.css',
-	WT_ROOT . 'themes/webtrees/style.css',
-	WT_ROOT . 'themes/xenea/favicon.png',
-	WT_ROOT . 'themes/xenea/images',
-	WT_ROOT . 'themes/xenea/msie.css',
-	WT_ROOT . 'themes/xenea/style.css',
-	// Removed in 1.5.1
-	WT_ROOT . 'themes/_administration/css-1.5.0',
-	WT_ROOT . 'themes/clouds/css-1.5.0',
-	WT_ROOT . 'themes/colors/css-1.5.0',
-	WT_ROOT . 'themes/fab/css-1.5.0',
-	WT_ROOT . 'themes/minimal/css-1.5.0',
-	WT_ROOT . 'themes/webtrees/css-1.5.0',
-	WT_ROOT . 'themes/xenea/css-1.5.0',
-	// Removed in 1.5.2
-	WT_ROOT . 'themes/_administration/css-1.5.1',
-	WT_ROOT . 'themes/clouds/css-1.5.1',
-	WT_ROOT . 'themes/colors/css-1.5.1',
-	WT_ROOT . 'themes/fab/css-1.5.1',
-	WT_ROOT . 'themes/minimal/css-1.5.1',
-	WT_ROOT . 'themes/webtrees/css-1.5.1',
-	WT_ROOT . 'themes/xenea/css-1.5.1',
-	// Removed in 1.5.3
-	WT_ROOT . 'modules_v3/GEDFact_assistant/_CENS/census_asst_help.php',
-	WT_ROOT . 'modules_v3/googlemap/admin_places.php',
-	WT_ROOT . 'modules_v3/googlemap/defaultconfig.php',
-	WT_ROOT . 'modules_v3/googlemap/googlemap.php',
-	WT_ROOT . 'modules_v3/googlemap/placehierarchy.php',
-	WT_ROOT . 'modules_v3/googlemap/places_edit.php',
-	WT_ROOT . 'modules_v3/googlemap/util.js',
-	WT_ROOT . 'modules_v3/googlemap/wt_v3_places_edit.js.php',
-	WT_ROOT . 'modules_v3/googlemap/wt_v3_places_edit_overlays.js.php',
-	WT_ROOT . 'modules_v3/googlemap/wt_v3_street_view.php',
-	WT_ROOT . 'readme.html',
-	WT_ROOT . 'themes/_administration/css-1.5.2',
-	WT_ROOT . 'themes/clouds/css-1.5.2',
-	WT_ROOT . 'themes/colors/css-1.5.2',
-	WT_ROOT . 'themes/fab/css-1.5.2',
-	WT_ROOT . 'themes/minimal/css-1.5.2',
-	WT_ROOT . 'themes/webtrees/css-1.5.2',
-	WT_ROOT . 'themes/xenea/css-1.5.2',
-	// Removed in 1.6.0
-	WT_ROOT . 'downloadbackup.php',
-	WT_ROOT . 'modules_v3/ckeditor/ckeditor-4.3.2-custom',
-	WT_ROOT . 'site-php-version.php',
-	WT_ROOT . 'themes/_administration/css-1.5.3',
-	WT_ROOT . 'themes/clouds/css-1.5.3',
-	WT_ROOT . 'themes/colors/css-1.5.3',
-	WT_ROOT . 'themes/fab/css-1.5.3',
-	WT_ROOT . 'themes/minimal/css-1.5.3',
-	WT_ROOT . 'themes/webtrees/css-1.5.3',
-	WT_ROOT . 'themes/xenea/css-1.5.3',
-	// Removed in 1.6.1
-	WT_ROOT . 'includes/authentication.php',
-	// Removed in 1.6.2
-	WT_ROOT . 'themes/_administration/css-1.6.0',
-	WT_ROOT . 'themes/_administration/jquery-ui-1.10.3',
-	WT_ROOT . 'themes/clouds/css-1.6.0',
-	WT_ROOT . 'themes/clouds/jquery-ui-1.10.3',
-	WT_ROOT . 'themes/colors/css-1.6.0',
-	WT_ROOT . 'themes/colors/jquery-ui-1.10.3',
-	WT_ROOT . 'themes/fab/css-1.6.0',
-	WT_ROOT . 'themes/fab/jquery-ui-1.10.3',
-	WT_ROOT . 'themes/minimal/css-1.6.0',
-	WT_ROOT . 'themes/minimal/jquery-ui-1.10.3',
-	WT_ROOT . 'themes/webtrees/css-1.6.0',
-	WT_ROOT . 'themes/webtrees/jquery-ui-1.10.3',
-	WT_ROOT . 'themes/xenea/css-1.6.0',
-	WT_ROOT . 'themes/xenea/jquery-ui-1.10.3',
-	WT_ROOT . 'themes/_administration/css-1.6.0',
-	WT_ROOT . 'themes/_administration/jquery-ui-1.10.3',
-	// Removed in 1.7.0
-	WT_ROOT . 'admin_site_other.php',
-	WT_ROOT . 'includes/config_data.php',
-	WT_ROOT . 'includes/db_schema',
-	WT_ROOT . 'includes/fonts',
-	WT_ROOT . 'includes/functions',
-	WT_ROOT . 'includes/hitcount.php',
-	WT_ROOT . 'includes/reportheader.php',
-	WT_ROOT . 'includes/specialchars.php',
-	WT_ROOT . 'js',
-	WT_ROOT . 'language/en_GB.mo', // Replaced with en-GB.mo
-	WT_ROOT . 'language/en_US.mo', // Replaced with en-US.mo
-	WT_ROOT . 'language/pt_BR.mo', // Replaced with pt-BR.mo
-	WT_ROOT . 'language/zh_CN.mo', // Replaced with zh-Hans.mo
-	WT_ROOT . 'language/extra',
-	WT_ROOT . 'library',
-	WT_ROOT . 'modules_v3/batch_update/admin_batch_update.php',
-	WT_ROOT . 'modules_v3/batch_update/plugins',
-	WT_ROOT . 'modules_v3/charts/help_text.php',
-	WT_ROOT . 'modules_v3/ckeditor/ckeditor-4.4.1-custom',
-	WT_ROOT . 'modules_v3/clippings/clippings_ctrl.php',
-	WT_ROOT . 'modules_v3/clippings/help_text.php',
-	WT_ROOT . 'modules_v3/faq/help_text.php',
-	WT_ROOT . 'modules_v3/gedcom_favorites/db_schema',
-	WT_ROOT . 'modules_v3/gedcom_news/db_schema',
-	WT_ROOT . 'modules_v3/googlemap/db_schema',
-	WT_ROOT . 'modules_v3/googlemap/help_text.php',
-	WT_ROOT . 'modules_v3/html/help_text.php',
-	WT_ROOT . 'modules_v3/logged_in/help_text.php',
-	WT_ROOT . 'modules_v3/review_changes/help_text.php',
-	WT_ROOT . 'modules_v3/todo/help_text.php',
-	WT_ROOT . 'modules_v3/tree/class_treeview.php',
-	WT_ROOT . 'modules_v3/user_blog/db_schema',
-	WT_ROOT . 'modules_v3/yahrzeit/help_text.php',
-	WT_ROOT . 'save.php',
-	WT_ROOT . 'themes/_administration/css-1.6.2',
-	WT_ROOT . 'themes/_administration/templates',
-	WT_ROOT . 'themes/_administration/header.php',
-	WT_ROOT . 'themes/_administration/footer.php',
-	WT_ROOT . 'themes/clouds/css-1.6.2',
-	WT_ROOT . 'themes/clouds/templates',
-	WT_ROOT . 'themes/clouds/header.php',
-	WT_ROOT . 'themes/clouds/footer.php',
-	WT_ROOT . 'themes/colors/css-1.6.2',
-	WT_ROOT . 'themes/colors/templates',
-	WT_ROOT . 'themes/colors/header.php',
-	WT_ROOT . 'themes/colors/footer.php',
-	WT_ROOT . 'themes/fab/css-1.6.2',
-	WT_ROOT . 'themes/fab/templates',
-	WT_ROOT . 'themes/fab/header.php',
-	WT_ROOT . 'themes/fab/footer.php',
-	WT_ROOT . 'themes/minimal/css-1.6.2',
-	WT_ROOT . 'themes/minimal/templates',
-	WT_ROOT . 'themes/minimal/header.php',
-	WT_ROOT . 'themes/minimal/footer.php',
-	WT_ROOT . 'themes/webtrees/css-1.6.2',
-	WT_ROOT . 'themes/webtrees/templates',
-	WT_ROOT . 'themes/webtrees/header.php',
-	WT_ROOT . 'themes/webtrees/footer.php',
-	WT_ROOT . 'themes/xenea/css-1.6.2',
-	WT_ROOT . 'themes/xenea/templates',
-	WT_ROOT . 'themes/xenea/header.php',
-	WT_ROOT . 'themes/xenea/footer.php',
-	// Removed in 1.7.2
-	WT_ROOT . 'assets/js-1.7.0',
-	WT_ROOT . 'packages/bootstrap-3.3.4',
-	WT_ROOT . 'packages/bootstrap-datetimepicker-4.0.0',
-	WT_ROOT . 'packages/ckeditor-4.4.7-custom',
-	WT_ROOT . 'packages/font-awesome-4.3.0',
-	WT_ROOT . 'packages/jquery-1.11.2',
-	WT_ROOT . 'packages/jquery-2.1.3',
-	WT_ROOT . 'packages/moment-2.10.3',
-	// Removed in 1.7.3
-	WT_ROOT . 'includes/php_53_compatibility.php',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/census/date.js',
-	WT_ROOT . 'modules_v3/GEDFact_assistant/census/dynamicoptionlist.js',
-	WT_ROOT . 'packages/jquery-cookie-1.4.1/jquery.cookie.js',
-	// Removed in 1.7.4
-	WT_ROOT . 'assets/js-1.7.2',
-	WT_ROOT . 'themes/_administration/css-1.7.0',
-	WT_ROOT . 'themes/clouds/css-1.7.0',
-	WT_ROOT . 'themes/colors/css-1.7.0',
-	WT_ROOT . 'themes/fab/css-1.7.0',
-	WT_ROOT . 'themes/minimal/css-1.7.0',
-	WT_ROOT . 'themes/webtrees/css-1.7.0',
-	WT_ROOT . 'themes/xenea/css-1.7.0',
-	WT_ROOT . 'packages/bootstrap-3.3.5',
-	WT_ROOT . 'packages/bootstrap-datetimepicker-4.15.35',
-	WT_ROOT . 'packages/jquery-1.11.3',
-	WT_ROOT . 'packages/jquery-2.1.4',
-	WT_ROOT . 'packages/moment-2.10.6',
-	// Removed in 1.7.5
-	WT_ROOT . 'themes/_administration/css-1.7.4',
-	WT_ROOT . 'themes/clouds/css-1.7.4',
-	WT_ROOT . 'themes/colors/css-1.7.4',
-	WT_ROOT . 'themes/fab/css-1.7.4',
-	WT_ROOT . 'themes/minimal/css-1.7.4',
-	WT_ROOT . 'themes/webtrees/css-1.7.4',
-	WT_ROOT . 'themes/xenea/css-1.7.4',
-	// Removed in 1.7.7
-	WT_ROOT . 'assets/js-1.7.4',
-	WT_ROOT . 'modules_v3/googlemap/images/css_sprite_facts.png',
-	WT_ROOT . 'modules_v3/googlemap/images/flag_shadow.png',
-	WT_ROOT . 'modules_v3/googlemap/images/shadow-left-large.png',
-	WT_ROOT . 'modules_v3/googlemap/images/shadow-left-small.png',
-	WT_ROOT . 'modules_v3/googlemap/images/shadow-right-large.png',
-	WT_ROOT . 'modules_v3/googlemap/images/shadow-right-small.png',
-	WT_ROOT . 'modules_v3/googlemap/images/shadow50.png',
-	WT_ROOT . 'modules_v3/googlemap/images/transparent-left-large.png',
-	WT_ROOT . 'modules_v3/googlemap/images/transparent-left-small.png',
-	WT_ROOT . 'modules_v3/googlemap/images/transparent-right-large.png',
-	WT_ROOT . 'modules_v3/googlemap/images/transparent-right-small.png',
-	// Removed in 1.7.8
-	WT_ROOT . 'themes/clouds/css-1.7.5',
-	WT_ROOT . 'themes/colors/css-1.7.5',
-	WT_ROOT . 'themes/fab/css-1.7.5',
-	WT_ROOT . 'themes/minimal/css-1.7.5',
-	WT_ROOT . 'themes/webtrees/css-1.7.5',
-	WT_ROOT . 'themes/xenea/css-1.7.5',
-	// Removed in 1.7.9
-	WT_ROOT . 'assets/js-1.7.7',
+    // Removed in 1.0.2
+    WT_ROOT . 'language/en.mo',
+    // Removed in 1.0.3
+    WT_ROOT . 'themechange.php',
+    // Removed in 1.0.4
+    // Removed in 1.0.5
+    // Removed in 1.0.6
+    WT_ROOT . 'includes/extras',
+    // Removed in 1.1.0
+    WT_ROOT . 'addremotelink.php',
+    WT_ROOT . 'addsearchlink.php',
+    WT_ROOT . 'client.php',
+    WT_ROOT . 'dir_editor.php',
+    WT_ROOT . 'editconfig_gedcom.php',
+    WT_ROOT . 'editgedcoms.php',
+    WT_ROOT . 'edit_merge.php',
+    WT_ROOT . 'genservice.php',
+    WT_ROOT . 'includes/classes',
+    WT_ROOT . 'includes/controllers',
+    WT_ROOT . 'includes/family_nav.php',
+    WT_ROOT . 'logs.php',
+    WT_ROOT . 'manageservers.php',
+    WT_ROOT . 'media.php',
+    WT_ROOT . 'module_admin.php',
+    //WT_ROOT.'modules', // Do not delete - users may have stored custom modules/data here
+    WT_ROOT . 'opensearch.php',
+    WT_ROOT . 'PEAR.php',
+    WT_ROOT . 'pgv_to_wt.php',
+    WT_ROOT . 'places',
+    //WT_ROOT.'robots.txt', // Do not delete this - it may contain user data
+    WT_ROOT . 'serviceClientTest.php',
+    WT_ROOT . 'siteconfig.php',
+    WT_ROOT . 'SOAP',
+    WT_ROOT . 'themes/clouds/mozilla.css',
+    WT_ROOT . 'themes/clouds/netscape.css',
+    WT_ROOT . 'themes/colors/mozilla.css',
+    WT_ROOT . 'themes/colors/netscape.css',
+    WT_ROOT . 'themes/fab/mozilla.css',
+    WT_ROOT . 'themes/fab/netscape.css',
+    WT_ROOT . 'themes/minimal/mozilla.css',
+    WT_ROOT . 'themes/minimal/netscape.css',
+    WT_ROOT . 'themes/webtrees/mozilla.css',
+    WT_ROOT . 'themes/webtrees/netscape.css',
+    WT_ROOT . 'themes/webtrees/style_rtl.css',
+    WT_ROOT . 'themes/xenea/mozilla.css',
+    WT_ROOT . 'themes/xenea/netscape.css',
+    WT_ROOT . 'uploadmedia.php',
+    WT_ROOT . 'useradmin.php',
+    WT_ROOT . 'webservice',
+    WT_ROOT . 'wtinfo.php',
+    // Removed in 1.1.1
+    // Removed in 1.1.2
+    WT_ROOT . 'treenav.php',
+    // Removed in 1.2.0
+    WT_ROOT . 'themes/clouds/jquery',
+    WT_ROOT . 'themes/colors/jquery',
+    WT_ROOT . 'themes/fab/jquery',
+    WT_ROOT . 'themes/minimal/jquery',
+    WT_ROOT . 'themes/webtrees/jquery',
+    WT_ROOT . 'themes/xenea/jquery',
+    // Removed in 1.2.1
+    // Removed in 1.2.2
+    WT_ROOT . 'themes/clouds/chrome.css',
+    WT_ROOT . 'themes/clouds/opera.css',
+    WT_ROOT . 'themes/clouds/print.css',
+    WT_ROOT . 'themes/clouds/style_rtl.css',
+    WT_ROOT . 'themes/colors/chrome.css',
+    WT_ROOT . 'themes/colors/opera.css',
+    WT_ROOT . 'themes/colors/print.css',
+    WT_ROOT . 'themes/colors/style_rtl.css',
+    WT_ROOT . 'themes/fab/chrome.css',
+    WT_ROOT . 'themes/fab/opera.css',
+    WT_ROOT . 'themes/minimal/chrome.css',
+    WT_ROOT . 'themes/minimal/opera.css',
+    WT_ROOT . 'themes/minimal/print.css',
+    WT_ROOT . 'themes/minimal/style_rtl.css',
+    WT_ROOT . 'themes/xenea/chrome.css',
+    WT_ROOT . 'themes/xenea/opera.css',
+    WT_ROOT . 'themes/xenea/print.css',
+    WT_ROOT . 'themes/xenea/style_rtl.css',
+    // Removed in 1.2.3
+    //WT_ROOT.'modules_v2', // Do not delete - users may have stored custom modules/data here
+    // Removed in 1.2.4
+    WT_ROOT . 'includes/cssparser.inc.php',
+    WT_ROOT . 'modules_v3/gedcom_favorites/help_text.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_3_find.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_3_search_add.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_5_input.js',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_5_input.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_7_parse_addLinksTbl.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_query_1a.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_query_2a.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_MEDIA/media_query_3a.php',
+    WT_ROOT . 'modules_v3/lightbox/css/album_page_RTL2.css',
+    WT_ROOT . 'modules_v3/lightbox/css/album_page_RTL.css',
+    WT_ROOT . 'modules_v3/lightbox/css/album_page_RTL_ff.css',
+    WT_ROOT . 'modules_v3/lightbox/css/clearbox_music.css',
+    WT_ROOT . 'modules_v3/lightbox/css/clearbox_music_RTL.css',
+    WT_ROOT . 'modules_v3/user_favorites/db_schema',
+    WT_ROOT . 'modules_v3/user_favorites/help_text.php',
+    WT_ROOT . 'search_engine.php',
+    WT_ROOT . 'themes/clouds/modules.css',
+    WT_ROOT . 'themes/colors/modules.css',
+    WT_ROOT . 'themes/fab/modules.css',
+    WT_ROOT . 'themes/minimal/modules.css',
+    WT_ROOT . 'themes/webtrees/modules.css',
+    WT_ROOT . 'themes/xenea/modules.css',
+    // Removed in 1.2.5
+    WT_ROOT . 'includes/media_reorder_count.php',
+    WT_ROOT . 'includes/media_tab_head.php',
+    WT_ROOT . 'modules_v3/clippings/index.php',
+    WT_ROOT . 'modules_v3/googlemap/css/googlemap_style.css',
+    WT_ROOT . 'modules_v3/googlemap/css/wt_v3_places_edit.css',
+    WT_ROOT . 'modules_v3/googlemap/index.php',
+    WT_ROOT . 'modules_v3/lightbox/index.php',
+    WT_ROOT . 'modules_v3/recent_changes/help_text.php',
+    WT_ROOT . 'modules_v3/todays_events/help_text.php',
+    WT_ROOT . 'sidebar.php',
+    // Removed in 1.2.6
+    WT_ROOT . 'modules_v3/sitemap/admin_index.php',
+    WT_ROOT . 'modules_v3/sitemap/help_text.php',
+    WT_ROOT . 'modules_v3/tree/css/styles',
+    WT_ROOT . 'modules_v3/tree/css/treebottom.gif',
+    WT_ROOT . 'modules_v3/tree/css/treebottomleft.gif',
+    WT_ROOT . 'modules_v3/tree/css/treebottomright.gif',
+    WT_ROOT . 'modules_v3/tree/css/tree.jpg',
+    WT_ROOT . 'modules_v3/tree/css/treeleft.gif',
+    WT_ROOT . 'modules_v3/tree/css/treeright.gif',
+    WT_ROOT . 'modules_v3/tree/css/treetop.gif',
+    WT_ROOT . 'modules_v3/tree/css/treetopleft.gif',
+    WT_ROOT . 'modules_v3/tree/css/treetopright.gif',
+    WT_ROOT . 'modules_v3/tree/css/treeview_print.css',
+    WT_ROOT . 'modules_v3/tree/help_text.php',
+    WT_ROOT . 'modules_v3/tree/images/print.png',
+    // Removed in 1.2.7
+    WT_ROOT . 'login_register.php',
+    WT_ROOT . 'modules_v3/top10_givnnames/help_text.php',
+    WT_ROOT . 'modules_v3/top10_surnames/help_text.php',
+    // Removed in 1.3.0
+    WT_ROOT . 'admin_site_ipaddress.php',
+    WT_ROOT . 'downloadgedcom.php',
+    WT_ROOT . 'export_gedcom.php',
+    WT_ROOT . 'gedcheck.php',
+    WT_ROOT . 'images',
+    WT_ROOT . 'includes/dmsounds_UTF8.php',
+    WT_ROOT . 'includes/grampsxml.rng',
+    WT_ROOT . 'includes/session_spider.php',
+    WT_ROOT . 'modules_v3/googlemap/admin_editconfig.php',
+    WT_ROOT . 'modules_v3/googlemap/admin_placecheck.php',
+    WT_ROOT . 'modules_v3/googlemap/flags.php',
+    WT_ROOT . 'modules_v3/googlemap/images/pedigree_map.gif',
+    WT_ROOT . 'modules_v3/googlemap/pedigree_map.php',
+    WT_ROOT . 'modules_v3/lightbox/admin_config.php',
+    WT_ROOT . 'modules_v3/lightbox/album.php',
+    WT_ROOT . 'modules_v3/tree/css/vline.jpg',
+    // Removed in 1.3.1
+    WT_ROOT . 'imageflush.php',
+    WT_ROOT . 'modules_v3/googlemap/wt_v3_pedigree_map.js.php',
+    WT_ROOT . 'modules_v3/lightbox/js/tip_balloon_RTL.js',
+    // Removed in 1.3.2
+    WT_ROOT . 'includes/set_gedcom_defaults.php',
+    WT_ROOT . 'modules_v3/address_report',
+    WT_ROOT . 'modules_v3/lightbox/functions/lb_horiz_sort.php',
+    WT_ROOT . 'modules_v3/random_media/help_text.php',
+    // Removed in 1.4.0
+    WT_ROOT . 'imageview.php',
+    WT_ROOT . 'media/MediaInfo.txt',
+    WT_ROOT . 'media/thumbs/ThumbsInfo.txt',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/css/media_0_inverselink.css',
+    WT_ROOT . 'modules_v3/lightbox/help_text.php',
+    WT_ROOT . 'modules_v3/lightbox/images/blank.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/close_1.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/image_add.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/image_copy.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/image_delete.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/image_edit.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/image_link.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/images.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/image_view.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/loading.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/next.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/nextlabel.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/norm_2.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/overlay.png',
+    WT_ROOT . 'modules_v3/lightbox/images/prev.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/prevlabel.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/private.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/slideshow.jpg',
+    WT_ROOT . 'modules_v3/lightbox/images/transp80px.gif',
+    WT_ROOT . 'modules_v3/lightbox/images/zoom_1.gif',
+    WT_ROOT . 'modules_v3/lightbox/js',
+    WT_ROOT . 'modules_v3/lightbox/music',
+    WT_ROOT . 'modules_v3/lightbox/pic',
+    WT_ROOT . 'themes/_administration/jquery',
+    WT_ROOT . 'themes/webtrees/chrome.css',
+    // Removed in 1.4.1
+    WT_ROOT . 'modules_v3/lightbox/images/image_edit.png',
+    WT_ROOT . 'modules_v3/lightbox/images/image_view.png',
+    // Removed in 1.4.2
+    WT_ROOT . 'modules_v3/lightbox/images/image_view.png',
+    WT_ROOT . 'modules_v3/top10_pageviews/help_text.php',
+    WT_ROOT . 'themes/_administration/jquery-ui-1.10.0',
+    WT_ROOT . 'themes/clouds/jquery-ui-1.10.0',
+    WT_ROOT . 'themes/colors/jquery-ui-1.10.0',
+    WT_ROOT . 'themes/fab/jquery-ui-1.10.0',
+    WT_ROOT . 'themes/minimal/jquery-ui-1.10.0',
+    WT_ROOT . 'themes/webtrees/jquery-ui-1.10.0',
+    WT_ROOT . 'themes/xenea/jquery-ui-1.10.0',
+    // Removed in 1.5.0
+    WT_ROOT . 'includes/media_reorder.php',
+    WT_ROOT . 'includes/old_messages.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_CENS/census_note_decode.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_CENS/census_asst_date.php',
+    WT_ROOT . 'modules_v3/googlemap/wt_v3_googlemap.js.php',
+    WT_ROOT . 'modules_v3/lightbox/functions/lightbox_print_media.php',
+    WT_ROOT . 'modules_v3/upcoming_events/help_text.php',
+    WT_ROOT . 'modules_v3/stories/help_text.php',
+    WT_ROOT . 'modules_v3/user_messages/help_text.php',
+    WT_ROOT . 'themes/_administration/favicon.png',
+    WT_ROOT . 'themes/_administration/images',
+    WT_ROOT . 'themes/_administration/msie.css',
+    WT_ROOT . 'themes/_administration/style.css',
+    WT_ROOT . 'themes/clouds/favicon.png',
+    WT_ROOT . 'themes/clouds/images',
+    WT_ROOT . 'themes/clouds/msie.css',
+    WT_ROOT . 'themes/clouds/style.css',
+    WT_ROOT . 'themes/colors/css',
+    WT_ROOT . 'themes/colors/favicon.png',
+    WT_ROOT . 'themes/colors/images',
+    WT_ROOT . 'themes/colors/ipad.css',
+    WT_ROOT . 'themes/colors/msie.css',
+    WT_ROOT . 'themes/fab/favicon.png',
+    WT_ROOT . 'themes/fab/images',
+    WT_ROOT . 'themes/fab/msie.css',
+    WT_ROOT . 'themes/fab/style.css',
+    WT_ROOT . 'themes/minimal/favicon.png',
+    WT_ROOT . 'themes/minimal/images',
+    WT_ROOT . 'themes/minimal/msie.css',
+    WT_ROOT . 'themes/minimal/style.css',
+    WT_ROOT . 'themes/webtrees/favicon.png',
+    WT_ROOT . 'themes/webtrees/images',
+    WT_ROOT . 'themes/webtrees/msie.css',
+    WT_ROOT . 'themes/webtrees/style.css',
+    WT_ROOT . 'themes/xenea/favicon.png',
+    WT_ROOT . 'themes/xenea/images',
+    WT_ROOT . 'themes/xenea/msie.css',
+    WT_ROOT . 'themes/xenea/style.css',
+    // Removed in 1.5.1
+    WT_ROOT . 'themes/_administration/css-1.5.0',
+    WT_ROOT . 'themes/clouds/css-1.5.0',
+    WT_ROOT . 'themes/colors/css-1.5.0',
+    WT_ROOT . 'themes/fab/css-1.5.0',
+    WT_ROOT . 'themes/minimal/css-1.5.0',
+    WT_ROOT . 'themes/webtrees/css-1.5.0',
+    WT_ROOT . 'themes/xenea/css-1.5.0',
+    // Removed in 1.5.2
+    WT_ROOT . 'themes/_administration/css-1.5.1',
+    WT_ROOT . 'themes/clouds/css-1.5.1',
+    WT_ROOT . 'themes/colors/css-1.5.1',
+    WT_ROOT . 'themes/fab/css-1.5.1',
+    WT_ROOT . 'themes/minimal/css-1.5.1',
+    WT_ROOT . 'themes/webtrees/css-1.5.1',
+    WT_ROOT . 'themes/xenea/css-1.5.1',
+    // Removed in 1.5.3
+    WT_ROOT . 'modules_v3/GEDFact_assistant/_CENS/census_asst_help.php',
+    WT_ROOT . 'modules_v3/googlemap/admin_places.php',
+    WT_ROOT . 'modules_v3/googlemap/defaultconfig.php',
+    WT_ROOT . 'modules_v3/googlemap/googlemap.php',
+    WT_ROOT . 'modules_v3/googlemap/placehierarchy.php',
+    WT_ROOT . 'modules_v3/googlemap/places_edit.php',
+    WT_ROOT . 'modules_v3/googlemap/util.js',
+    WT_ROOT . 'modules_v3/googlemap/wt_v3_places_edit.js.php',
+    WT_ROOT . 'modules_v3/googlemap/wt_v3_places_edit_overlays.js.php',
+    WT_ROOT . 'modules_v3/googlemap/wt_v3_street_view.php',
+    WT_ROOT . 'readme.html',
+    WT_ROOT . 'themes/_administration/css-1.5.2',
+    WT_ROOT . 'themes/clouds/css-1.5.2',
+    WT_ROOT . 'themes/colors/css-1.5.2',
+    WT_ROOT . 'themes/fab/css-1.5.2',
+    WT_ROOT . 'themes/minimal/css-1.5.2',
+    WT_ROOT . 'themes/webtrees/css-1.5.2',
+    WT_ROOT . 'themes/xenea/css-1.5.2',
+    // Removed in 1.6.0
+    WT_ROOT . 'downloadbackup.php',
+    WT_ROOT . 'modules_v3/ckeditor/ckeditor-4.3.2-custom',
+    WT_ROOT . 'site-php-version.php',
+    WT_ROOT . 'themes/_administration/css-1.5.3',
+    WT_ROOT . 'themes/clouds/css-1.5.3',
+    WT_ROOT . 'themes/colors/css-1.5.3',
+    WT_ROOT . 'themes/fab/css-1.5.3',
+    WT_ROOT . 'themes/minimal/css-1.5.3',
+    WT_ROOT . 'themes/webtrees/css-1.5.3',
+    WT_ROOT . 'themes/xenea/css-1.5.3',
+    // Removed in 1.6.1
+    WT_ROOT . 'includes/authentication.php',
+    // Removed in 1.6.2
+    WT_ROOT . 'themes/_administration/css-1.6.0',
+    WT_ROOT . 'themes/_administration/jquery-ui-1.10.3',
+    WT_ROOT . 'themes/clouds/css-1.6.0',
+    WT_ROOT . 'themes/clouds/jquery-ui-1.10.3',
+    WT_ROOT . 'themes/colors/css-1.6.0',
+    WT_ROOT . 'themes/colors/jquery-ui-1.10.3',
+    WT_ROOT . 'themes/fab/css-1.6.0',
+    WT_ROOT . 'themes/fab/jquery-ui-1.10.3',
+    WT_ROOT . 'themes/minimal/css-1.6.0',
+    WT_ROOT . 'themes/minimal/jquery-ui-1.10.3',
+    WT_ROOT . 'themes/webtrees/css-1.6.0',
+    WT_ROOT . 'themes/webtrees/jquery-ui-1.10.3',
+    WT_ROOT . 'themes/xenea/css-1.6.0',
+    WT_ROOT . 'themes/xenea/jquery-ui-1.10.3',
+    WT_ROOT . 'themes/_administration/css-1.6.0',
+    WT_ROOT . 'themes/_administration/jquery-ui-1.10.3',
+    // Removed in 1.7.0
+    WT_ROOT . 'admin_site_other.php',
+    WT_ROOT . 'includes/config_data.php',
+    WT_ROOT . 'includes/db_schema',
+    WT_ROOT . 'includes/fonts',
+    WT_ROOT . 'includes/functions',
+    WT_ROOT . 'includes/hitcount.php',
+    WT_ROOT . 'includes/reportheader.php',
+    WT_ROOT . 'includes/specialchars.php',
+    WT_ROOT . 'js',
+    WT_ROOT . 'language/en_GB.mo', // Replaced with en-GB.mo
+    WT_ROOT . 'language/en_US.mo', // Replaced with en-US.mo
+    WT_ROOT . 'language/pt_BR.mo', // Replaced with pt-BR.mo
+    WT_ROOT . 'language/zh_CN.mo', // Replaced with zh-Hans.mo
+    WT_ROOT . 'language/extra',
+    WT_ROOT . 'library',
+    WT_ROOT . 'modules_v3/batch_update/admin_batch_update.php',
+    WT_ROOT . 'modules_v3/batch_update/plugins',
+    WT_ROOT . 'modules_v3/charts/help_text.php',
+    WT_ROOT . 'modules_v3/ckeditor/ckeditor-4.4.1-custom',
+    WT_ROOT . 'modules_v3/clippings/clippings_ctrl.php',
+    WT_ROOT . 'modules_v3/clippings/help_text.php',
+    WT_ROOT . 'modules_v3/faq/help_text.php',
+    WT_ROOT . 'modules_v3/gedcom_favorites/db_schema',
+    WT_ROOT . 'modules_v3/gedcom_news/db_schema',
+    WT_ROOT . 'modules_v3/googlemap/db_schema',
+    WT_ROOT . 'modules_v3/googlemap/help_text.php',
+    WT_ROOT . 'modules_v3/html/help_text.php',
+    WT_ROOT . 'modules_v3/logged_in/help_text.php',
+    WT_ROOT . 'modules_v3/review_changes/help_text.php',
+    WT_ROOT . 'modules_v3/todo/help_text.php',
+    WT_ROOT . 'modules_v3/tree/class_treeview.php',
+    WT_ROOT . 'modules_v3/user_blog/db_schema',
+    WT_ROOT . 'modules_v3/yahrzeit/help_text.php',
+    WT_ROOT . 'save.php',
+    WT_ROOT . 'themes/_administration/css-1.6.2',
+    WT_ROOT . 'themes/_administration/templates',
+    WT_ROOT . 'themes/_administration/header.php',
+    WT_ROOT . 'themes/_administration/footer.php',
+    WT_ROOT . 'themes/clouds/css-1.6.2',
+    WT_ROOT . 'themes/clouds/templates',
+    WT_ROOT . 'themes/clouds/header.php',
+    WT_ROOT . 'themes/clouds/footer.php',
+    WT_ROOT . 'themes/colors/css-1.6.2',
+    WT_ROOT . 'themes/colors/templates',
+    WT_ROOT . 'themes/colors/header.php',
+    WT_ROOT . 'themes/colors/footer.php',
+    WT_ROOT . 'themes/fab/css-1.6.2',
+    WT_ROOT . 'themes/fab/templates',
+    WT_ROOT . 'themes/fab/header.php',
+    WT_ROOT . 'themes/fab/footer.php',
+    WT_ROOT . 'themes/minimal/css-1.6.2',
+    WT_ROOT . 'themes/minimal/templates',
+    WT_ROOT . 'themes/minimal/header.php',
+    WT_ROOT . 'themes/minimal/footer.php',
+    WT_ROOT . 'themes/webtrees/css-1.6.2',
+    WT_ROOT . 'themes/webtrees/templates',
+    WT_ROOT . 'themes/webtrees/header.php',
+    WT_ROOT . 'themes/webtrees/footer.php',
+    WT_ROOT . 'themes/xenea/css-1.6.2',
+    WT_ROOT . 'themes/xenea/templates',
+    WT_ROOT . 'themes/xenea/header.php',
+    WT_ROOT . 'themes/xenea/footer.php',
+    // Removed in 1.7.2
+    WT_ROOT . 'assets/js-1.7.0',
+    WT_ROOT . 'packages/bootstrap-3.3.4',
+    WT_ROOT . 'packages/bootstrap-datetimepicker-4.0.0',
+    WT_ROOT . 'packages/ckeditor-4.4.7-custom',
+    WT_ROOT . 'packages/font-awesome-4.3.0',
+    WT_ROOT . 'packages/jquery-1.11.2',
+    WT_ROOT . 'packages/jquery-2.1.3',
+    WT_ROOT . 'packages/moment-2.10.3',
+    // Removed in 1.7.3
+    WT_ROOT . 'includes/php_53_compatibility.php',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/census/date.js',
+    WT_ROOT . 'modules_v3/GEDFact_assistant/census/dynamicoptionlist.js',
+    WT_ROOT . 'packages/jquery-cookie-1.4.1/jquery.cookie.js',
+    // Removed in 1.7.4
+    WT_ROOT . 'assets/js-1.7.2',
+    WT_ROOT . 'themes/_administration/css-1.7.0',
+    WT_ROOT . 'themes/clouds/css-1.7.0',
+    WT_ROOT . 'themes/colors/css-1.7.0',
+    WT_ROOT . 'themes/fab/css-1.7.0',
+    WT_ROOT . 'themes/minimal/css-1.7.0',
+    WT_ROOT . 'themes/webtrees/css-1.7.0',
+    WT_ROOT . 'themes/xenea/css-1.7.0',
+    WT_ROOT . 'packages/bootstrap-3.3.5',
+    WT_ROOT . 'packages/bootstrap-datetimepicker-4.15.35',
+    WT_ROOT . 'packages/jquery-1.11.3',
+    WT_ROOT . 'packages/jquery-2.1.4',
+    WT_ROOT . 'packages/moment-2.10.6',
+    // Removed in 1.7.5
+    WT_ROOT . 'themes/_administration/css-1.7.4',
+    WT_ROOT . 'themes/clouds/css-1.7.4',
+    WT_ROOT . 'themes/colors/css-1.7.4',
+    WT_ROOT . 'themes/fab/css-1.7.4',
+    WT_ROOT . 'themes/minimal/css-1.7.4',
+    WT_ROOT . 'themes/webtrees/css-1.7.4',
+    WT_ROOT . 'themes/xenea/css-1.7.4',
+    // Removed in 1.7.7
+    WT_ROOT . 'assets/js-1.7.4',
+    WT_ROOT . 'modules_v3/googlemap/images/css_sprite_facts.png',
+    WT_ROOT . 'modules_v3/googlemap/images/flag_shadow.png',
+    WT_ROOT . 'modules_v3/googlemap/images/shadow-left-large.png',
+    WT_ROOT . 'modules_v3/googlemap/images/shadow-left-small.png',
+    WT_ROOT . 'modules_v3/googlemap/images/shadow-right-large.png',
+    WT_ROOT . 'modules_v3/googlemap/images/shadow-right-small.png',
+    WT_ROOT . 'modules_v3/googlemap/images/shadow50.png',
+    WT_ROOT . 'modules_v3/googlemap/images/transparent-left-large.png',
+    WT_ROOT . 'modules_v3/googlemap/images/transparent-left-small.png',
+    WT_ROOT . 'modules_v3/googlemap/images/transparent-right-large.png',
+    WT_ROOT . 'modules_v3/googlemap/images/transparent-right-small.png',
+    // Removed in 1.7.8
+    WT_ROOT . 'themes/clouds/css-1.7.5',
+    WT_ROOT . 'themes/colors/css-1.7.5',
+    WT_ROOT . 'themes/fab/css-1.7.5',
+    WT_ROOT . 'themes/minimal/css-1.7.5',
+    WT_ROOT . 'themes/webtrees/css-1.7.5',
+    WT_ROOT . 'themes/xenea/css-1.7.5',
+    // Removed in 1.7.9
+    WT_ROOT . 'assets/js-1.7.7',
 );
 
 // Delete old files (if we can).
 $files_to_delete = array();
 foreach ($old_files as $file) {
-	if (file_exists($file) && !File::delete($file)) {
-		$files_to_delete[] = $file;
-	}
+    if (file_exists($file) && !File::delete($file)) {
+        $files_to_delete[] = $file;
+    }
 }
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Control panel') . ' — ' . /* I18N: A summary of the system status */ I18N::translate('Dashboard'))
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Control panel') . ' — ' . /* I18N: A summary of the system status */ I18N::translate('Dashboard'))
+    ->pageHeader();
 
 // Check for updates
 $latest_version_txt = Functions::fetchLatestVersion();
 if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-	list($latest_version) = explode('|', $latest_version_txt);
+    list($latest_version) = explode('|', $latest_version_txt);
 } else {
-	// Cannot determine the latest version
-	$latest_version = '';
+    // Cannot determine the latest version
+    $latest_version = '';
 }
 
 $update_available = Auth::isAdmin() && $latest_version && version_compare(WT_VERSION, $latest_version) < 0;
@@ -498,78 +498,78 @@ 
 
 // Administrators
 $administrators = Database::prepare(
-	"SELECT user_id, real_name FROM `##user` JOIN `##user_setting` USING (user_id) WHERE setting_name='canadmin' AND setting_value='1'"
+    "SELECT user_id, real_name FROM `##user` JOIN `##user_setting` USING (user_id) WHERE setting_name='canadmin' AND setting_value='1'"
 )->fetchAll();
 
 // Managers
 $managers = Database::prepare(
-	"SELECT user_id, real_name FROM `##user` JOIN `##user_gedcom_setting` USING (user_id)" .
-	" WHERE setting_name = 'canedit' AND setting_value='admin'" .
-	" GROUP BY user_id, real_name" .
-	" ORDER BY real_name"
+    "SELECT user_id, real_name FROM `##user` JOIN `##user_gedcom_setting` USING (user_id)" .
+    " WHERE setting_name = 'canedit' AND setting_value='admin'" .
+    " GROUP BY user_id, real_name" .
+    " ORDER BY real_name"
 )->fetchAll();
 
 // Moderators
 $moderators = Database::prepare(
-	"SELECT user_id, real_name FROM `##user` JOIN `##user_gedcom_setting` USING (user_id)" .
-	" WHERE setting_name = 'canedit' AND setting_value='accept'" .
-	" GROUP BY user_id, real_name" .
-	" ORDER BY real_name"
+    "SELECT user_id, real_name FROM `##user` JOIN `##user_gedcom_setting` USING (user_id)" .
+    " WHERE setting_name = 'canedit' AND setting_value='accept'" .
+    " GROUP BY user_id, real_name" .
+    " ORDER BY real_name"
 )->fetchAll();
 
 // Number of users who have not verified their email address
 $unverified = Database::prepare(
-	"SELECT user_id, real_name FROM `##user` JOIN `##user_setting` USING (user_id)" .
-	" WHERE setting_name = 'verified' AND setting_value = '0'" .
-	" ORDER BY real_name"
+    "SELECT user_id, real_name FROM `##user` JOIN `##user_setting` USING (user_id)" .
+    " WHERE setting_name = 'verified' AND setting_value = '0'" .
+    " ORDER BY real_name"
 )->fetchAll();
 
 // Number of users whose accounts are not approved by an administrator
 $unapproved = Database::prepare(
-	"SELECT user_id, real_name FROM `##user` JOIN `##user_setting` USING (user_id)" .
-	" WHERE setting_name = 'verified_by_admin' AND setting_value = '0'" .
-	" ORDER BY real_name"
+    "SELECT user_id, real_name FROM `##user` JOIN `##user_setting` USING (user_id)" .
+    " WHERE setting_name = 'verified_by_admin' AND setting_value = '0'" .
+    " ORDER BY real_name"
 )->fetchAll();
 
 // Users currently logged in
 $logged_in = Database::prepare(
-	"SELECT DISTINCT user_id, real_name FROM `##user` JOIN `##session` USING (user_id)" .
-	" ORDER BY real_name"
+    "SELECT DISTINCT user_id, real_name FROM `##user` JOIN `##session` USING (user_id)" .
+    " ORDER BY real_name"
 )->fetchAll();
 
 // Count of records
 $individuals = Database::prepare(
-	"SELECT gedcom_id, COUNT(i_id) AS count FROM `##gedcom` LEFT JOIN `##individuals` ON gedcom_id = i_file GROUP BY gedcom_id"
+    "SELECT gedcom_id, COUNT(i_id) AS count FROM `##gedcom` LEFT JOIN `##individuals` ON gedcom_id = i_file GROUP BY gedcom_id"
 )->fetchAssoc();
 $families = Database::prepare(
-	"SELECT gedcom_id, COUNT(f_id) AS count FROM `##gedcom` LEFT JOIN `##families` ON gedcom_id = f_file GROUP BY gedcom_id"
+    "SELECT gedcom_id, COUNT(f_id) AS count FROM `##gedcom` LEFT JOIN `##families` ON gedcom_id = f_file GROUP BY gedcom_id"
 )->fetchAssoc();
 $sources = Database::prepare(
-	"SELECT gedcom_id, COUNT(s_id) AS count FROM `##gedcom` LEFT JOIN `##sources` ON gedcom_id = s_file GROUP BY gedcom_id"
+    "SELECT gedcom_id, COUNT(s_id) AS count FROM `##gedcom` LEFT JOIN `##sources` ON gedcom_id = s_file GROUP BY gedcom_id"
 )->fetchAssoc();
 $media = Database::prepare(
-	"SELECT gedcom_id, COUNT(m_id) AS count FROM `##gedcom` LEFT JOIN `##media` ON gedcom_id = m_file GROUP BY gedcom_id"
+    "SELECT gedcom_id, COUNT(m_id) AS count FROM `##gedcom` LEFT JOIN `##media` ON gedcom_id = m_file GROUP BY gedcom_id"
 )->fetchAssoc();
 $repositories = Database::prepare(
-	"SELECT gedcom_id, COUNT(o_id) AS count FROM `##gedcom` LEFT JOIN `##other` ON gedcom_id = o_file AND o_type = 'REPO' GROUP BY gedcom_id"
+    "SELECT gedcom_id, COUNT(o_id) AS count FROM `##gedcom` LEFT JOIN `##other` ON gedcom_id = o_file AND o_type = 'REPO' GROUP BY gedcom_id"
 )->fetchAssoc();
 $changes = Database::prepare(
-	"SELECT g.gedcom_id, COUNT(change_id) AS count FROM `##gedcom` AS g LEFT JOIN `##change` AS c ON g.gedcom_id = c.gedcom_id AND status = 'pending' GROUP BY g.gedcom_id"
+    "SELECT g.gedcom_id, COUNT(change_id) AS count FROM `##gedcom` AS g LEFT JOIN `##change` AS c ON g.gedcom_id = c.gedcom_id AND status = 'pending' GROUP BY g.gedcom_id"
 )->fetchAssoc();
 
 // Server warnings
 // Note that security support for 5.6 ends after security support for 7.0
 $server_warnings = array();
 if (
-	PHP_VERSION_ID < 50600 ||
-	PHP_VERSION_ID < 70000 && date('Y-m-d') >= '2018-12-31' ||
-	PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70100 && date('Y-m-d') >= '2018-12-03' ||
-	PHP_VERSION_ID < 70200 && date('Y-m-d') >= '2019-12-01' ||
-	PHP_VERSION_ID < 70300 && date('Y-m-d') >= '2020-11-30'
+    PHP_VERSION_ID < 50600 ||
+    PHP_VERSION_ID < 70000 && date('Y-m-d') >= '2018-12-31' ||
+    PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70100 && date('Y-m-d') >= '2018-12-03' ||
+    PHP_VERSION_ID < 70200 && date('Y-m-d') >= '2019-12-01' ||
+    PHP_VERSION_ID < 70300 && date('Y-m-d') >= '2020-11-30'
 ) {
-	$server_warnings[] =
-		I18N::translate('Your web server is using PHP version %s, which is no longer receiving security updates. You should upgrade to a later version as soon as possible.', PHP_VERSION) .
-		'<br><a href="https://php.net/supported-versions.php">https://php.net/supported-versions.php</a>';
+    $server_warnings[] =
+        I18N::translate('Your web server is using PHP version %s, which is no longer receiving security updates. You should upgrade to a later version as soon as possible.', PHP_VERSION) .
+        '<br><a href="https://php.net/supported-versions.php">https://php.net/supported-versions.php</a>';
 }
 ?>
 <h1><?php echo $controller->getPageTitle(); ?></h1>

logout.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 $gedcom = Session::get('GEDCOM', '');
 
 if (Auth::id()) {
-	Log::addAuthenticationLog('Logout: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
-	Auth::logout();
-	FlashMessages::addMessage(I18N::translate('You have signed out.'), 'info');
+    Log::addAuthenticationLog('Logout: ' . Auth::user()->getUserName() . '/' . Auth::user()->getRealName());
+    Auth::logout();
+    FlashMessages::addMessage(I18N::translate('You have signed out.'), 'info');
 }
 
 header('Location: ' . WT_BASE_URL . 'index.php?ged=' . rawurlencode($gedcom));

inverselink.php

Indentation +110 added lines, -110 removed lines

@@ -30,11 +30,11 @@ 
 
 $controller = new SimpleController;
 $controller
-	->restrictAccess(Auth::isEditor($WT_TREE))
-	->setPageTitle(I18N::translate('Link to an existing media object'))
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();')
-	->pageHeader();
+    ->restrictAccess(Auth::isEditor($WT_TREE))
+    ->setPageTitle(I18N::translate('Link to an existing media object'))
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();')
+    ->pageHeader();
 
 //-- page parameters and checking
 $linktoid = Filter::get('linktoid', WT_REGEX_XREF);
@@ -44,119 +44,119 @@ 
 
 // If GedFAct_assistant/_MEDIA/ installed ======================
 if ($linkto == 'manage' && Module::getModuleByName('GEDFact_assistant')) {
-	require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/_MEDIA/media_0_inverselink.php';
+    require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/_MEDIA/media_0_inverselink.php';
 } else {
 
-	//-- check for admin
-	$paramok = true;
-	if (!empty($linktoid)) {
-		$paramok = GedcomRecord::getInstance($linktoid, $WT_TREE)->canShow();
-	}
+    //-- check for admin
+    $paramok = true;
+    if (!empty($linktoid)) {
+        $paramok = GedcomRecord::getInstance($linktoid, $WT_TREE)->canShow();
+    }
 
-	if ($action == "choose" && $paramok) {
-		echo '<form name="link" method="get" action="inverselink.php">';
-		echo '<input type="hidden" name="action" value="update">';
-		if (!empty($mediaid)) {
-			echo '<input type="hidden" name="mediaid" value="', $mediaid, '">';
-		}
-		if (!empty($linktoid)) {
-			echo '<input type="hidden" name="linktoid" value="', $linktoid, '">';
-		}
-		echo '<input type="hidden" name="linkto" value="', $linkto, '">';
-		echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
-		echo '<table class="facts_table">';
-		echo '<tr><td class="topbottombar" colspan="2">';
-		echo I18N::translate('Link to an existing media object');
-		echo '</td></tr><tr><td class="descriptionbox width20 wrap">', I18N::translate('Media'), '</td>';
-		echo '<td class="optionbox wrap">';
-		if (!empty($mediaid)) {
-			//-- Get the title of this existing Media item
-			$title =
-				Database::prepare("SELECT m_titl FROM `##media` where m_id=? AND m_file=?")
-				->execute(array($mediaid, $WT_TREE->getTreeId()))
-				->fetchOne();
-			if ($title) {
-				echo '<b>', Filter::escapeHtml($title), '</b>';
-			} else {
-				echo '<b>', $mediaid, '</b>';
-			}
-		} else {
-			echo '<input data-autocomplete-type="OBJE" type="text" name="mediaid" id="mediaid" size="5">';
-			echo ' ', FunctionsPrint::printFindMediaLink('mediaid', '1media');
-			echo '</td></tr>';
-		}
+    if ($action == "choose" && $paramok) {
+        echo '<form name="link" method="get" action="inverselink.php">';
+        echo '<input type="hidden" name="action" value="update">';
+        if (!empty($mediaid)) {
+            echo '<input type="hidden" name="mediaid" value="', $mediaid, '">';
+        }
+        if (!empty($linktoid)) {
+            echo '<input type="hidden" name="linktoid" value="', $linktoid, '">';
+        }
+        echo '<input type="hidden" name="linkto" value="', $linkto, '">';
+        echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
+        echo '<table class="facts_table">';
+        echo '<tr><td class="topbottombar" colspan="2">';
+        echo I18N::translate('Link to an existing media object');
+        echo '</td></tr><tr><td class="descriptionbox width20 wrap">', I18N::translate('Media'), '</td>';
+        echo '<td class="optionbox wrap">';
+        if (!empty($mediaid)) {
+            //-- Get the title of this existing Media item
+            $title =
+                Database::prepare("SELECT m_titl FROM `##media` where m_id=? AND m_file=?")
+                ->execute(array($mediaid, $WT_TREE->getTreeId()))
+                ->fetchOne();
+            if ($title) {
+                echo '<b>', Filter::escapeHtml($title), '</b>';
+            } else {
+                echo '<b>', $mediaid, '</b>';
+            }
+        } else {
+            echo '<input data-autocomplete-type="OBJE" type="text" name="mediaid" id="mediaid" size="5">';
+            echo ' ', FunctionsPrint::printFindMediaLink('mediaid', '1media');
+            echo '</td></tr>';
+        }
 
-		if (!isset($linktoid)) {
-			$linktoid = '';
-		}
-		echo '<tr><td class="descriptionbox">';
+        if (!isset($linktoid)) {
+            $linktoid = '';
+        }
+        echo '<tr><td class="descriptionbox">';
 
-		if ($linkto == "person") {
-			echo I18N::translate('Individual'), "</td>";
-			echo '<td class="optionbox wrap">';
-			if ($linktoid == "") {
-				echo '<input class="pedigree_form" type="text" name="linktoid" id="linktopid" size="3" value="', $linktoid, '"> ';
-				echo FunctionsPrint::printFindIndividualLink('linktopid');
-			} else {
-				$record = Individual::getInstance($linktoid, $WT_TREE);
-				echo $record->formatList('span', false, $record->getFullName());
-			}
-		}
+        if ($linkto == "person") {
+            echo I18N::translate('Individual'), "</td>";
+            echo '<td class="optionbox wrap">';
+            if ($linktoid == "") {
+                echo '<input class="pedigree_form" type="text" name="linktoid" id="linktopid" size="3" value="', $linktoid, '"> ';
+                echo FunctionsPrint::printFindIndividualLink('linktopid');
+            } else {
+                $record = Individual::getInstance($linktoid, $WT_TREE);
+                echo $record->formatList('span', false, $record->getFullName());
+            }
+        }
 
-		if ($linkto == "family") {
-			echo I18N::translate('Family'), '</td>';
-			echo '<td class="optionbox wrap">';
-			if ($linktoid == "") {
-				echo '<input class="pedigree_form" type="text" name="linktoid" id="linktofamid" size="3" value="', $linktoid, '"> ';
-				echo FunctionsPrint::printFindFamilyLink('linktofamid');
-			} else {
-				$record = Family::getInstance($linktoid, $WT_TREE);
-				echo $record->formatList('span', false, $record->getFullName());
-			}
-		}
+        if ($linkto == "family") {
+            echo I18N::translate('Family'), '</td>';
+            echo '<td class="optionbox wrap">';
+            if ($linktoid == "") {
+                echo '<input class="pedigree_form" type="text" name="linktoid" id="linktofamid" size="3" value="', $linktoid, '"> ';
+                echo FunctionsPrint::printFindFamilyLink('linktofamid');
+            } else {
+                $record = Family::getInstance($linktoid, $WT_TREE);
+                echo $record->formatList('span', false, $record->getFullName());
+            }
+        }
 
-		if ($linkto == "source") {
-			echo I18N::translate('Source'), "</td>";
-			echo '<td  class="optionbox wrap">';
-			if ($linktoid == "") {
-				echo '<input class="pedigree_form" type="text" name="linktoid" id="linktosid" size="3" value="', $linktoid, '"> ';
-				echo FunctionsPrint::printFindSourceLink('linktosid');
-			} else {
-				$record = Source::getInstance($linktoid, $WT_TREE);
-				echo $record->formatList('span', false, $record->getFullName());
-			}
-		}
-		if ($linkto == "repository") {
-			echo I18N::translate('Repository'), "</td>";
-			echo '<td  class="optionbox wrap">';
-			if ($linktoid == "") {
-				echo '<input class="pedigree_form" type="text" name="linktoid" id="linktorid" size="3" value="', $linktoid, '">';
-			} else {
-				$record = Repository::getInstance($linktoid, $WT_TREE);
-				echo $record->formatList('span', false, $record->getFullName());
-			}
-		}
+        if ($linkto == "source") {
+            echo I18N::translate('Source'), "</td>";
+            echo '<td  class="optionbox wrap">';
+            if ($linktoid == "") {
+                echo '<input class="pedigree_form" type="text" name="linktoid" id="linktosid" size="3" value="', $linktoid, '"> ';
+                echo FunctionsPrint::printFindSourceLink('linktosid');
+            } else {
+                $record = Source::getInstance($linktoid, $WT_TREE);
+                echo $record->formatList('span', false, $record->getFullName());
+            }
+        }
+        if ($linkto == "repository") {
+            echo I18N::translate('Repository'), "</td>";
+            echo '<td  class="optionbox wrap">';
+            if ($linktoid == "") {
+                echo '<input class="pedigree_form" type="text" name="linktoid" id="linktorid" size="3" value="', $linktoid, '">';
+            } else {
+                $record = Repository::getInstance($linktoid, $WT_TREE);
+                echo $record->formatList('span', false, $record->getFullName());
+            }
+        }
 
-		if ($linkto == "note") {
-			echo I18N::translate('Shared note'), "</td>";
-			echo '<td  class="optionbox wrap">';
-			if ($linktoid == "") {
-				echo '<input class="pedigree_form" type="text" name="linktoid" id="linktonid" size="3" value="', $linktoid, '">';
-			} else {
-				$record = Note::getInstance($linktoid, $WT_TREE);
-				echo $record->formatList('span', false, $record->getFullName());
-			}
-		}
+        if ($linkto == "note") {
+            echo I18N::translate('Shared note'), "</td>";
+            echo '<td  class="optionbox wrap">';
+            if ($linktoid == "") {
+                echo '<input class="pedigree_form" type="text" name="linktoid" id="linktonid" size="3" value="', $linktoid, '">';
+            } else {
+                $record = Note::getInstance($linktoid, $WT_TREE);
+                echo $record->formatList('span', false, $record->getFullName());
+            }
+        }
 
-		echo '</td></tr>';
-		echo '<tr><td class="topbottombar" colspan="2"><input type="submit" value="', /* I18N: A button label (a verb). */ I18N::translate('link'), '"></td></tr>';
-		echo '</table>';
-		echo '</form>';
-	} elseif ($action == "update" && $paramok) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $mediaid . '@', true);
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
+        echo '</td></tr>';
+        echo '<tr><td class="topbottombar" colspan="2"><input type="submit" value="', /* I18N: A button label (a verb). */ I18N::translate('link'), '"></td></tr>';
+        echo '</table>';
+        echo '</form>';
+    } elseif ($action == "update" && $paramok) {
+        $record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+        $record->createFact('1 OBJE @' . $mediaid . '@', true);
+        $controller->addInlineJavascript('closePopupAndReloadParent();');
 
-	}
-	echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+    }
+    echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
 }

admin_module_sidebar.php

Indentation +18 added lines, -18 removed lines

@@ -24,33 +24,33 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Sidebars'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Sidebars'));
 
 $action  = Filter::post('action');
 $modules = Module::getAllModulesByComponent('sidebar');
 
 if ($action === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		foreach (Tree::getAll() as $tree) {
-			$access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
-			Database::prepare(
-				"REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'sidebar', ?)"
-			)->execute(array($module->getName(), $tree->getTreeId(), $access_level));
-		}
-		$order = Filter::post('order-' . $module->getName());
-		Database::prepare(
-			"UPDATE `##module` SET sidebar_order = ? WHERE module_name = ?"
-		)->execute(array($order, $module->getName()));
-	}
+    foreach ($modules as $module) {
+        foreach (Tree::getAll() as $tree) {
+            $access_level = Filter::post('access-' . $module->getName() . '-' . $tree->getTreeId(), WT_REGEX_INTEGER, $module->defaultAccessLevel());
+            Database::prepare(
+                "REPLACE INTO `##module_privacy` (module_name, gedcom_id, component, access_level) VALUES (?, ?, 'sidebar', ?)"
+            )->execute(array($module->getName(), $tree->getTreeId(), $access_level));
+        }
+        $order = Filter::post('order-' . $module->getName());
+        Database::prepare(
+            "UPDATE `##module` SET sidebar_order = ? WHERE module_name = ?"
+        )->execute(array($order, $module->getName()));
+    }
 
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+    return;
 }
 
 $controller
-	->addInlineJavascript('
+    ->addInlineJavascript('
 		jQuery("#module_table").sortable({
 			items: ".sortme",
 			forceHelperSize: true,
@@ -67,7 +67,7 @@ 
 			}
 		});
 	')
-	->pageHeader();
+    ->pageHeader();
 
 ?>
 <ol class="breadcrumb small">

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
 				<td class="col-xs-1">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 					<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-					<?php echo $module->getTitle(); ?>
+					<?php else {
+    : ?>
+					<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>