fisharebest / webtrees

admin_site_logs.php

Switch Indentation +39 added lines, -39 removed lines

@@ -98,52 +98,52 @@
 }
 
 switch ($action) {
-    case 'delete':
-        $sql_delete =
-        "DELETE `##log` FROM `##log`" .
-        " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-        " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
-
-        Database::prepare($sql_delete . $where)->execute($args);
-        break;
-
-    case 'export':
-        header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename="webtrees-logs.csv"');
-        $rows = Database::prepare($sql_select . $where . ' ORDER BY log_id')->execute($args)->fetchAll();
-        foreach ($rows as $row) {
-            echo
-            '"', $row->log_time, '",',
-            '"', $row->log_type, '",',
-            '"', str_replace('"', '""', $row->log_message), '",',
-            '"', $row->ip_address, '",',
-            '"', str_replace('"', '""', $row->user_name), '",',
-            '"', str_replace('"', '""', $row->gedcom_name), '"',
-            "\n";
-        }
+        case 'delete':
+            $sql_delete =
+            "DELETE `##log` FROM `##log`" .
+            " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+            " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+
+            Database::prepare($sql_delete . $where)->execute($args);
+            break;
+
+        case 'export':
+            header('Content-Type: text/csv');
+            header('Content-Disposition: attachment; filename="webtrees-logs.csv"');
+            $rows = Database::prepare($sql_select . $where . ' ORDER BY log_id')->execute($args)->fetchAll();
+            foreach ($rows as $row) {
+                echo
+                '"', $row->log_time, '",',
+                '"', $row->log_type, '",',
+                '"', str_replace('"', '""', $row->log_message), '",',
+                '"', $row->ip_address, '",',
+                '"', str_replace('"', '""', $row->user_name), '",',
+                '"', str_replace('"', '""', $row->gedcom_name), '"',
+                "\n";
+            }
 
-        return;
-    case 'load_json':
-        $start  = Filter::getInteger('start');
-        $length = Filter::getInteger('length');
-        $order  = Filter::getArray('order');
-
-        if ($order) {
-            $order_by = " ORDER BY ";
-            foreach ($order as $key => $value) {
-                if ($key > 0) {
-                    $order_by .= ',';
-                }
-                // Datatables numbers columns 0, 1, 2
-                // MySQL numbers columns 1, 2, 3
-                switch ($value['dir']) {
+            return;
+        case 'load_json':
+            $start  = Filter::getInteger('start');
+            $length = Filter::getInteger('length');
+            $order  = Filter::getArray('order');
+
+            if ($order) {
+                $order_by = " ORDER BY ";
+                foreach ($order as $key => $value) {
+                    if ($key > 0) {
+                        $order_by .= ',';
+                    }
+                    // Datatables numbers columns 0, 1, 2
+                    // MySQL numbers columns 1, 2, 3
+                    switch ($value['dir']) {
                     case 'asc':
                         $order_by .= (1 + $value['column']) . " ASC ";
                         break;
                     case 'desc':
                         $order_by .= (1 + $value['column']) . " DESC ";
                     break;
-                }
+                    }
             }
         } else {
             $order_by = " ORDER BY 1 ASC";

admin_site_config.php

Switch Indentation +19 added lines, -19 removed lines

@@ -137,25 +137,25 @@
 }
 
 switch (Filter::get('action')) {
-    case 'site':
-        $controller->setPageTitle(I18N::translate('Website preferences'));
-        break;
-    case 'email':
-        $controller->setPageTitle(I18N::translate('Sending email'));
-        break;
-    case 'login':
-        $controller->setPageTitle(I18N::translate('Sign-in and registration'));
-        break;
-    case 'tracking':
-        $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
-        break;
-    case 'languages':
-        $controller->setPageTitle(I18N::translate('Languages'));
-        break;
-    default:
-        header('Location: ' . WT_BASE_URL . 'admin.php');
-
-        return;
+        case 'site':
+            $controller->setPageTitle(I18N::translate('Website preferences'));
+            break;
+        case 'email':
+            $controller->setPageTitle(I18N::translate('Sending email'));
+            break;
+        case 'login':
+            $controller->setPageTitle(I18N::translate('Sign-in and registration'));
+            break;
+        case 'tracking':
+            $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
+            break;
+        case 'languages':
+            $controller->setPageTitle(I18N::translate('Languages'));
+            break;
+        default:
+            header('Location: ' . WT_BASE_URL . 'admin.php');
+
+            return;
 }
 
 $controller->pageHeader();

ancestry.php

Switch Indentation +38 added lines, -38 removed lines

@@ -129,46 +129,46 @@
     return;
 }
 switch ($controller->chart_style) {
-    case 0:
-        // List
-        echo '<ul id="ancestry_chart" class="chart_common">';
-        $controller->printChildAscendancy($controller->root, 1, $controller->generations - 1);
-        echo '</ul>';
-        echo '<br>';
-        break;
-    case 1:
-        echo '<div id="ancestry_booklet">';
-        // Booklet
-        // first page : show indi facts
-        FunctionsPrint::printPedigreePerson($controller->root, $controller->showFull());
-        // process the tree
-        $ancestors = $controller->sosaAncestors($controller->generations - 1);
-        $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+        case 0:
+            // List
+            echo '<ul id="ancestry_chart" class="chart_common">';
+            $controller->printChildAscendancy($controller->root, 1, $controller->generations - 1);
+            echo '</ul>';
+            echo '<br>';
+            break;
+        case 1:
+            echo '<div id="ancestry_booklet">';
+            // Booklet
+            // first page : show indi facts
+            FunctionsPrint::printPedigreePerson($controller->root, $controller->showFull());
+            // process the tree
+            $ancestors = $controller->sosaAncestors($controller->generations - 1);
+            $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
 
-        foreach ($ancestors as $sosa => $individual) {
-            foreach ($individual->getChildFamilies() as $family) {
-                FunctionsCharts::printSosaFamily($family->getXref(), $individual->getXref(), $sosa, '', '', '', $controller->show_cousins, $controller->showFull());
+            foreach ($ancestors as $sosa => $individual) {
+                foreach ($individual->getChildFamilies() as $family) {
+                    FunctionsCharts::printSosaFamily($family->getXref(), $individual->getXref(), $sosa, '', '', '', $controller->show_cousins, $controller->showFull());
+                }
             }
-        }
-        echo '</div>';
-        break;
-    case 2:
-        // Individual list
-        $ancestors = $controller->sosaAncestors($controller->generations);
-        $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
-        echo '<div id="ancestry-list">', FunctionsPrintLists::individualTable($ancestors, 'sosa'), '</div>';
-        break;
-    case 3:
-        // Family list
-        $ancestors = $controller->sosaAncestors($controller->generations - 1);
-        $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
-        $families  = array();
-        foreach ($ancestors as $individual) {
-            foreach ($individual->getChildFamilies() as $family) {
-                $families[$family->getXref()] = $family;
+            echo '</div>';
+            break;
+        case 2:
+            // Individual list
+            $ancestors = $controller->sosaAncestors($controller->generations);
+            $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+            echo '<div id="ancestry-list">', FunctionsPrintLists::individualTable($ancestors, 'sosa'), '</div>';
+            break;
+        case 3:
+            // Family list
+            $ancestors = $controller->sosaAncestors($controller->generations - 1);
+            $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+            $families  = array();
+            foreach ($ancestors as $individual) {
+                foreach ($individual->getChildFamilies() as $family) {
+                    $families[$family->getXref()] = $family;
+                }
             }
-        }
-        echo '<div id="ancestry-list">', FunctionsPrintLists::familyTable($families), '</div>';
-        break;
+            echo '<div id="ancestry-list">', FunctionsPrintLists::familyTable($families), '</div>';
+            break;
 }
 echo '</div>';

action.php

Switch Indentation +162 added lines, -162 removed lines

@@ -38,34 +38,34 @@ 
 }
 
 switch (Filter::post('action')) {
-    case 'accept-changes':
-        // Accept all the pending changes for a record
-        $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-        if ($record && Auth::isModerator($record->getTree()) && $record->canShow() && $record->canEdit()) {
-            if ($record->isPendingDeletion()) {
-                FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
-                I18N::translate('“%s” has been deleted.', $record->getFullName()));
+        case 'accept-changes':
+            // Accept all the pending changes for a record
+            $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+            if ($record && Auth::isModerator($record->getTree()) && $record->canShow() && $record->canEdit()) {
+                if ($record->isPendingDeletion()) {
+                    FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
+                    I18N::translate('“%s” has been deleted.', $record->getFullName()));
+                } else {
+                    FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
+                    I18N::translate('The changes to “%s” have been accepted.', $record->getFullName()));
+                }
+                FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
             } else {
-                FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
-                I18N::translate('The changes to “%s” have been accepted.', $record->getFullName()));
+                http_response_code(406);
             }
-            FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
-        } else {
-            http_response_code(406);
-        }
-        break;
+            break;
 
-    case 'copy-fact':
-        // Copy a fact to the clipboard
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id = Filter::post('fact_id');
+        case 'copy-fact':
+            // Copy a fact to the clipboard
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id = Filter::post('fact_id');
 
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
 
-        if ($record && $record->canEdit()) {
-            foreach ($record->getFacts() as $fact) {
-                if ($fact->getFactId() == $fact_id) {
-                    switch ($fact->getTag()) {
+            if ($record && $record->canEdit()) {
+                foreach ($record->getFacts() as $fact) {
+                    if ($fact->getFactId() == $fact_id) {
+                        switch ($fact->getTag()) {
                         case 'NOTE':
                         case 'SOUR':
                         case 'OBJE':
@@ -74,7 +74,7 @@ 
                         default:
                             $type = $record::RECORD_TYPE; // paste only to the same record type
                         break;
-                    }
+                        }
                     $clipboard = Session::get('clipboard');
                     if (!is_array($clipboard)) {
                         $clipboard = array();
@@ -96,158 +96,158 @@ 
         }
         break;
 
-    case 'paste-fact':
-        // Paste a fact from the clipboard
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id   = Filter::post('fact_id');
-        $record    = GedcomRecord::getInstance($xref, $WT_TREE);
-        $clipboard = Session::get('clipboard');
+        case 'paste-fact':
+            // Paste a fact from the clipboard
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id   = Filter::post('fact_id');
+            $record    = GedcomRecord::getInstance($xref, $WT_TREE);
+            $clipboard = Session::get('clipboard');
 
-        if ($record && $record->canEdit() && isset($clipboard[$fact_id])) {
-            $record->createFact($clipboard[$fact_id]['factrec'], true);
-        }
-        break;
-
-    case 'delete-fact':
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id = Filter::post('fact_id');
-
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        if ($record && $record->canShow() && $record->canEdit()) {
-            foreach ($record->getFacts() as $fact) {
-                if ($fact->getFactId() == $fact_id && $fact->canShow() && $fact->canEdit()) {
-                    $record->deleteFact($fact_id, true);
-                    break 2;
+            if ($record && $record->canEdit() && isset($clipboard[$fact_id])) {
+                $record->createFact($clipboard[$fact_id]['factrec'], true);
+            }
+            break;
+
+        case 'delete-fact':
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id = Filter::post('fact_id');
+
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            if ($record && $record->canShow() && $record->canEdit()) {
+                foreach ($record->getFacts() as $fact) {
+                    if ($fact->getFactId() == $fact_id && $fact->canShow() && $fact->canEdit()) {
+                        $record->deleteFact($fact_id, true);
+                        break 2;
+                    }
                 }
             }
-        }
-
-        // Can’t find the record/fact, or don’t have permission to delete it.
-        http_response_code(406);
-        break;
 
-    case 'delete-record':
-        $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-        if ($record && Auth::isEditor($record->getTree()) && $record->canShow() && $record->canEdit()) {
-            // Delete links to this record
-            foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->getTreeId()) as $xref) {
-                $linker     = GedcomRecord::getInstance($xref, $WT_TREE);
-                $old_gedcom = $linker->getGedcom();
-                $new_gedcom = FunctionsEdit::removeLinks($old_gedcom, $record->getXref());
-                // FunctionsDb::fetch_all_links() does not take account of pending changes. The links (or even the
-                // record itself) may have already been deleted.
-                if ($old_gedcom !== $new_gedcom) {
-                    // If we have removed a link from a family to an individual, and it has only one member
-                    if (preg_match('/^0 @' . WT_REGEX_XREF . '@ FAM/', $new_gedcom) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . WT_REGEX_XREF . ')@/', $new_gedcom, $match) == 1) {
-                        // Delete the family
-                        $family = GedcomRecord::getInstance($xref, $WT_TREE);
-                        FlashMessages::addMessage(/* I18N: %s is the name of a family group, e.g. “Husband name + Wife name” */ I18N::translate('The family “%s” has been deleted because it only has one member.', $family->getFullName()));
-                        $family->deleteRecord();
-                        // Delete any remaining link to this family
-                        if ($match) {
-                            $relict     = GedcomRecord::getInstance($match[2][0], $WT_TREE);
-                            $new_gedcom = $relict->getGedcom();
-                            $new_gedcom = FunctionsEdit::removeLinks($new_gedcom, $linker->getXref());
-                            $relict->updateRecord($new_gedcom, false);
-                            FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $relict->getFullName(), $family->getFullName()));
+            // Can’t find the record/fact, or don’t have permission to delete it.
+            http_response_code(406);
+            break;
+
+        case 'delete-record':
+            $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+            if ($record && Auth::isEditor($record->getTree()) && $record->canShow() && $record->canEdit()) {
+                // Delete links to this record
+                foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->getTreeId()) as $xref) {
+                    $linker     = GedcomRecord::getInstance($xref, $WT_TREE);
+                    $old_gedcom = $linker->getGedcom();
+                    $new_gedcom = FunctionsEdit::removeLinks($old_gedcom, $record->getXref());
+                    // FunctionsDb::fetch_all_links() does not take account of pending changes. The links (or even the
+                    // record itself) may have already been deleted.
+                    if ($old_gedcom !== $new_gedcom) {
+                        // If we have removed a link from a family to an individual, and it has only one member
+                        if (preg_match('/^0 @' . WT_REGEX_XREF . '@ FAM/', $new_gedcom) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . WT_REGEX_XREF . ')@/', $new_gedcom, $match) == 1) {
+                            // Delete the family
+                            $family = GedcomRecord::getInstance($xref, $WT_TREE);
+                            FlashMessages::addMessage(/* I18N: %s is the name of a family group, e.g. “Husband name + Wife name” */ I18N::translate('The family “%s” has been deleted because it only has one member.', $family->getFullName()));
+                            $family->deleteRecord();
+                            // Delete any remaining link to this family
+                            if ($match) {
+                                $relict     = GedcomRecord::getInstance($match[2][0], $WT_TREE);
+                                $new_gedcom = $relict->getGedcom();
+                                $new_gedcom = FunctionsEdit::removeLinks($new_gedcom, $linker->getXref());
+                                $relict->updateRecord($new_gedcom, false);
+                                FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $relict->getFullName(), $family->getFullName()));
+                            }
+                        } else {
+                            // Remove links from $linker to $record
+                            FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $linker->getFullName(), $record->getFullName()));
+                            $linker->updateRecord($new_gedcom, false);
                         }
-                    } else {
-                        // Remove links from $linker to $record
-                        FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $linker->getFullName(), $record->getFullName()));
-                        $linker->updateRecord($new_gedcom, false);
                     }
                 }
+                // Delete the record itself
+                $record->deleteRecord();
+            } else {
+                http_response_code(406);
             }
-            // Delete the record itself
-            $record->deleteRecord();
-        } else {
-            http_response_code(406);
-        }
-        break;
-
-    case 'delete-user':
-        $user = User::find(Filter::postInteger('user_id'));
+            break;
 
-        if ($user && Auth::isAdmin() && Auth::user() !== $user) {
-            Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
-            $user->delete();
-        }
-        break;
+        case 'delete-user':
+            $user = User::find(Filter::postInteger('user_id'));
 
-    case 'language':
-        // Change the current language
-        $language = Filter::post('language');
-        try {
-            I18N::init($language);
-            Session::put('locale', $language);
-            // Remember our selection
-            Auth::user()->setPreference('language', $language);
-        } catch (\Exception $ex) {
-            // Request for a non-existant language.
-            http_response_code(406);
-        }
-        break;
-
-    case 'masquerade':
-        $user = User::find(Filter::postInteger('user_id'));
+            if ($user && Auth::isAdmin() && Auth::user() !== $user) {
+                Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
+                $user->delete();
+            }
+            break;
+
+        case 'language':
+            // Change the current language
+            $language = Filter::post('language');
+            try {
+                I18N::init($language);
+                Session::put('locale', $language);
+                // Remember our selection
+                Auth::user()->setPreference('language', $language);
+            } catch (\Exception $ex) {
+                // Request for a non-existant language.
+                http_response_code(406);
+            }
+            break;
 
-        if ($user && Auth::isAdmin() && Auth::user() !== $user) {
-            Log::addAuthenticationLog('Masquerade as user: ' . $user->getUserName());
-            Auth::login($user);
-            Session::put('masquerade', '1');
-        } else {
-            http_response_code(406);
-        }
-        break;
+        case 'masquerade':
+            $user = User::find(Filter::postInteger('user_id'));
 
-    case 'unlink-media':
-        // Remove links from an individual and their spouse-family records to a media object.
-        // Used by the "unlink" option on the album (lightbox) tab.
-        $source = Individual::getInstance(Filter::post('source', WT_REGEX_XREF), $WT_TREE);
-        $target = Filter::post('target', WT_REGEX_XREF);
-        if ($source && $source->canShow() && $source->canEdit() && $target) {
-            // Consider the individual and their spouse-family records
-            $sources   = $source->getSpouseFamilies();
-            $sources[] = $source;
-            foreach ($sources as $source) {
-                foreach ($source->getFacts() as $fact) {
-                    if (!$fact->isPendingDeletion()) {
-                        if ($fact->getValue() == '@' . $target . '@') {
-                            // Level 1 links
-                            $source->deleteFact($fact->getFactId(), true);
-                        } elseif (strpos($fact->getGedcom(), ' @' . $target . '@')) {
-                            // Level 2-3 links
-                            $source->updateFact($fact->getFactId(), preg_replace(array('/\n2 OBJE @' . $target . '@(\n[3-9].*)*/', '/\n3 OBJE @' . $target . '@(\n[4-9].*)*/'), '', $fact->getGedcom()), true);
+            if ($user && Auth::isAdmin() && Auth::user() !== $user) {
+                Log::addAuthenticationLog('Masquerade as user: ' . $user->getUserName());
+                Auth::login($user);
+                Session::put('masquerade', '1');
+            } else {
+                http_response_code(406);
+            }
+            break;
+
+        case 'unlink-media':
+            // Remove links from an individual and their spouse-family records to a media object.
+            // Used by the "unlink" option on the album (lightbox) tab.
+            $source = Individual::getInstance(Filter::post('source', WT_REGEX_XREF), $WT_TREE);
+            $target = Filter::post('target', WT_REGEX_XREF);
+            if ($source && $source->canShow() && $source->canEdit() && $target) {
+                // Consider the individual and their spouse-family records
+                $sources   = $source->getSpouseFamilies();
+                $sources[] = $source;
+                foreach ($sources as $source) {
+                    foreach ($source->getFacts() as $fact) {
+                        if (!$fact->isPendingDeletion()) {
+                            if ($fact->getValue() == '@' . $target . '@') {
+                                // Level 1 links
+                                $source->deleteFact($fact->getFactId(), true);
+                            } elseif (strpos($fact->getGedcom(), ' @' . $target . '@')) {
+                                // Level 2-3 links
+                                $source->updateFact($fact->getFactId(), preg_replace(array('/\n2 OBJE @' . $target . '@(\n[3-9].*)*/', '/\n3 OBJE @' . $target . '@(\n[4-9].*)*/'), '', $fact->getGedcom()), true);
+                            }
                         }
                     }
                 }
+            } else {
+                http_response_code(406);
             }
-        } else {
-            http_response_code(406);
-        }
-        break;
-
-    case 'reject-changes':
-        // Reject all the pending changes for a record
-        $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-        if ($record && $record->canEdit() && Auth::isModerator($record->getTree())) {
-            FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('The changes to “%s” have been rejected.', $record->getFullName()));
-            FunctionsImport::rejectAllChanges($record);
-        } else {
-            http_response_code(406);
-        }
-        break;
-
-    case 'theme':
-        // Change the current theme
-        $theme = Filter::post('theme');
-        if (Site::getPreference('ALLOW_USER_THEMES') && array_key_exists($theme, Theme::themeNames())) {
-            Session::put('theme_id', $theme);
-            // Remember our selection
-            Auth::user()->setPreference('theme', $theme);
-        } else {
-            // Request for a non-existant theme.
-            http_response_code(406);
-        }
-        break;
+            break;
+
+        case 'reject-changes':
+            // Reject all the pending changes for a record
+            $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+            if ($record && $record->canEdit() && Auth::isModerator($record->getTree())) {
+                FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('The changes to “%s” have been rejected.', $record->getFullName()));
+                FunctionsImport::rejectAllChanges($record);
+            } else {
+                http_response_code(406);
+            }
+            break;
+
+        case 'theme':
+            // Change the current theme
+            $theme = Filter::post('theme');
+            if (Site::getPreference('ALLOW_USER_THEMES') && array_key_exists($theme, Theme::themeNames())) {
+                Session::put('theme_id', $theme);
+                // Remember our selection
+                Auth::user()->setPreference('theme', $theme);
+            } else {
+                // Request for a non-existant theme.
+                http_response_code(406);
+            }
+            break;
 }

admin_site_change.php

Switch Indentation +40 added lines, -40 removed lines

@@ -111,53 +111,53 @@
 }
 
 switch ($action) {
-    case 'delete':
-        $sql_delete =
-        "DELETE `##change` FROM `##change`" .
-        " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-        " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
-
-        Database::prepare($sql_delete . $where)->execute($args);
-        break;
-
-    case 'export':
-        header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
-        $rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
-        foreach ($rows as $row) {
-            echo
-            '"', $row->change_time, '",',
-            '"', $row->status, '",',
-            '"', $row->xref, '",',
-            '"', str_replace('"', '""', $row->old_gedcom), '",',
-            '"', str_replace('"', '""', $row->new_gedcom), '",',
-            '"', str_replace('"', '""', $row->user_name), '",',
-            '"', str_replace('"', '""', $row->gedcom_name), '"',
-            "\n";
-        }
+        case 'delete':
+            $sql_delete =
+            "DELETE `##change` FROM `##change`" .
+            " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+            " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+
+            Database::prepare($sql_delete . $where)->execute($args);
+            break;
+
+        case 'export':
+            header('Content-Type: text/csv');
+            header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
+            $rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
+            foreach ($rows as $row) {
+                echo
+                '"', $row->change_time, '",',
+                '"', $row->status, '",',
+                '"', $row->xref, '",',
+                '"', str_replace('"', '""', $row->old_gedcom), '",',
+                '"', str_replace('"', '""', $row->new_gedcom), '",',
+                '"', str_replace('"', '""', $row->user_name), '",',
+                '"', str_replace('"', '""', $row->gedcom_name), '"',
+                "\n";
+            }
 
-        return;
-    case 'load_json':
-        $start  = Filter::getInteger('start');
-        $length = Filter::getInteger('length');
-        $order  = Filter::getArray('order');
-
-        if ($order) {
-            $order_by = " ORDER BY ";
-            foreach ($order as $key => $value) {
-                if ($key > 0) {
-                    $order_by .= ',';
-                }
-                // Datatables numbers columns 0, 1, 2
-                // MySQL numbers columns 1, 2, 3
-                switch ($value['dir']) {
+            return;
+        case 'load_json':
+            $start  = Filter::getInteger('start');
+            $length = Filter::getInteger('length');
+            $order  = Filter::getArray('order');
+
+            if ($order) {
+                $order_by = " ORDER BY ";
+                foreach ($order as $key => $value) {
+                    if ($key > 0) {
+                        $order_by .= ',';
+                    }
+                    // Datatables numbers columns 0, 1, 2
+                    // MySQL numbers columns 1, 2, 3
+                    switch ($value['dir']) {
                     case 'asc':
                         $order_by .= (1 + $value['column']) . " ASC ";
                         break;
                     case 'desc':
                         $order_by .= (1 + $value['column']) . " DESC ";
                     break;
-                }
+                    }
             }
         } else {
             $order_by = " ORDER BY 1 DESC";

edit_interface.php

Switch Indentation +1344 added lines, -1344 removed lines

@@ -41,22 +41,22 @@ 
 
 switch ($action) {
 ////////////////////////////////////////////////////////////////////////////////
-    case 'editraw':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
+        case 'editraw':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
 
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        check_record_access($record);
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            check_record_access($record);
 
-        $controller
-        ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
-        ->pageHeader()
-        ->addInlineJavascript('jQuery("#raw-gedcom-list").sortable({opacity: 0.7, cursor: "move", axis: "y"});');
+            $controller
+            ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
+            ->pageHeader()
+            ->addInlineJavascript('jQuery("#raw-gedcom-list").sortable({opacity: 0.7, cursor: "move", axis: "y"});');
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2>
             <?php echo $controller->getPageTitle(); ?>
-            <?php echo FunctionsPrint::helpLink('edit_edit_raw'); ?>
+                <?php echo FunctionsPrint::helpLink('edit_edit_raw'); ?>
         </h2>
         <pre>     <?php echo '0 @' . $record->getXref() . '@ ' . $record::RECORD_TYPE; ?></pre>
         <form method="post" action="edit_interface.php">
@@ -64,9 +64,9 @@ 
             <input type="hidden" name="action" value="updateraw">
             <input type="hidden" name="xref" value="<?php echo $xref; ?>">
             <?php echo Filter::getCsrf(); ?>
-            <ul id="raw-gedcom-list">
+                <ul id="raw-gedcom-list">
                 <?php foreach ($record->getFacts() as $fact) { ?>
-                    <?php if (!$fact->isPendingDeletion()) { ?>
+                        <?php if (!$fact->isPendingDeletion()) { ?>
                     <li>
                         <div style="cursor:move;">
                             <?php echo $fact->summary(); ?>
@@ -75,7 +75,7 @@ 
                         <textarea name="fact[]" dir="ltr" rows="<?php echo preg_match_all('/\n/', $fact->getGedcom(), $dummy_parameter_for_php53); ?>" style="width:100%;"><?php echo Filter::escapeHtml($fact->getGedcom()); ?></textarea>
                     </li>
                     <?php } ?>
-                <?php } ?>
+                    <?php } ?>
                 <li>
                     <div style="cursor:move;">
                         <b><i><?php echo I18N::translate('Add a fact'); ?><i></b>
@@ -91,83 +91,83 @@ 
         </form>
     </div>
         <?php
-        break;
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'updateraw':
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $facts     = Filter::postArray('fact');
-        $fact_ids  = Filter::postArray('fact_id');
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'updateraw':
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $facts     = Filter::postArray('fact');
+            $fact_ids  = Filter::postArray('fact_id');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=editraw&xref=' . $xref);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=editraw&xref=' . $xref);
 
-            return;
-        }
+                return;
+            }
 
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        check_record_access($record);
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            check_record_access($record);
 
-        $controller
-        ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
+            ->pageHeader();
 
-        $gedcom = '0 @' . $record->getXref() . '@ ' . $record::RECORD_TYPE;
+            $gedcom = '0 @' . $record->getXref() . '@ ' . $record::RECORD_TYPE;
 
-        // Retain any private facts
-        foreach ($record->getFacts(null, false, Auth::PRIV_HIDE) as $fact) {
-            if (!in_array($fact->getFactId(), $fact_ids) && !$fact->isPendingDeletion()) {
-                $gedcom .= "\n" . $fact->getGedcom();
+            // Retain any private facts
+            foreach ($record->getFacts(null, false, Auth::PRIV_HIDE) as $fact) {
+                if (!in_array($fact->getFactId(), $fact_ids) && !$fact->isPendingDeletion()) {
+                    $gedcom .= "\n" . $fact->getGedcom();
+                }
+            }
+            // Append the new facts
+            foreach ($facts as $fact) {
+                $gedcom .= "\n" . $fact;
             }
-        }
-        // Append the new facts
-        foreach ($facts as $fact) {
-            $gedcom .= "\n" . $fact;
-        }
 
-        // Cleanup the client’s bad editing?
-        $gedcom = preg_replace('/[\r\n]+/', "\n", $gedcom); // Empty lines
-        $gedcom = trim($gedcom); // Leading/trailing spaces
+            // Cleanup the client’s bad editing?
+            $gedcom = preg_replace('/[\r\n]+/', "\n", $gedcom); // Empty lines
+            $gedcom = trim($gedcom); // Leading/trailing spaces
 
-        $record->updateRecord($gedcom, false);
+            $record->updateRecord($gedcom, false);
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'editrawfact':
-        $xref    = Filter::get('xref', WT_REGEX_XREF);
-        $fact_id = Filter::get('fact_id');
-
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        check_record_access($record);
-
-        // Find the fact to edit
-        $edit_fact = null;
-        foreach ($record->getFacts() as $fact) {
-            if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
-                $edit_fact = $fact;
-                break;
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'editrawfact':
+            $xref    = Filter::get('xref', WT_REGEX_XREF);
+            $fact_id = Filter::get('fact_id');
+
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            check_record_access($record);
+
+            // Find the fact to edit
+            $edit_fact = null;
+            foreach ($record->getFacts() as $fact) {
+                if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
+                    $edit_fact = $fact;
+                    break;
+                }
             }
-        }
-        if (!$edit_fact) {
-            $controller
-            ->pageHeader()
-            ->addInlineJavascript('closePopupAndReloadParent();');
+            if (!$edit_fact) {
+                $controller
+                ->pageHeader()
+                ->addInlineJavascript('closePopupAndReloadParent();');
 
-            return;
-        }
+                return;
+            }
 
-        $controller
-        ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
+            ->pageHeader();
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2>
             <?php echo $controller->getPageTitle(); ?>
-            <?php echo FunctionsPrint::helpLink('edit_edit_raw'); ?>
-            <?php FunctionsPrint::printSpecialCharacterLink('gedcom'); ?>
+                <?php echo FunctionsPrint::helpLink('edit_edit_raw'); ?>
+                <?php FunctionsPrint::printSpecialCharacterLink('gedcom'); ?>
         </h2>
         <form method="post" action="edit_interface.php">
             <input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
@@ -175,7 +175,7 @@ 
             <input type="hidden" name="xref" value="<?php echo $xref; ?>">
             <input type="hidden" name="fact_id" value="<?php echo $fact_id; ?>">
             <?php echo Filter::getCsrf(); ?>
-            <textarea name="gedcom" id="gedcom" dir="ltr"><?php echo Filter::escapeHtml($edit_fact->getGedcom()); ?></textarea>
+                <textarea name="gedcom" id="gedcom" dir="ltr"><?php echo Filter::escapeHtml($edit_fact->getGedcom()); ?></textarea>
             <table class="facts_table">
                 <?php echo keep_chan($record); ?>
             </table>
@@ -186,98 +186,98 @@ 
         </form>
     </div>
         <?php
-        break;
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'updaterawfact':
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id   = Filter::post('fact_id');
-        $gedcom    = Filter::post('gedcom');
-        $keep_chan = Filter::postBool('keep_chan');
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'updaterawfact':
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id   = Filter::post('fact_id');
+            $gedcom    = Filter::post('gedcom');
+            $keep_chan = Filter::postBool('keep_chan');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=editrawfact&xref=' . $xref . '&fact_id=' . $fact_id);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=editrawfact&xref=' . $xref . '&fact_id=' . $fact_id);
 
-            return;
-        }
+                return;
+            }
 
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        check_record_access($record);
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            check_record_access($record);
 
-        // Find the fact to edit
-        $edit_fact = null;
-        foreach ($record->getFacts() as $fact) {
-            if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
-                $edit_fact = $fact;
-                break;
+            // Find the fact to edit
+            $edit_fact = null;
+            foreach ($record->getFacts() as $fact) {
+                if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
+                    $edit_fact = $fact;
+                    break;
+                }
             }
-        }
-        if (!$edit_fact) {
+            if (!$edit_fact) {
+                $controller
+                ->pageHeader()
+                ->addInlineJavascript('closePopupAndReloadParent();');
+
+                return;
+            }
+
             $controller
-            ->pageHeader()
-            ->addInlineJavascript('closePopupAndReloadParent();');
+            ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
+            ->pageHeader();
 
-            return;
-        }
+            // Cleanup the client’s bad editing?
+            $gedcom = preg_replace('/[\r\n]+/', "\n", $gedcom); // Empty lines
+            $gedcom = trim($gedcom); // Leading/trailing spaces
 
-        $controller
-        ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit the raw GEDCOM'))
-        ->pageHeader();
+            $record->updateFact($fact_id, $gedcom, !$keep_chan);
 
-        // Cleanup the client’s bad editing?
-        $gedcom = preg_replace('/[\r\n]+/', "\n", $gedcom); // Empty lines
-        $gedcom = trim($gedcom); // Leading/trailing spaces
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-        $record->updateFact($fact_id, $gedcom, !$keep_chan);
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'edit':
+            $xref    = Filter::get('xref', WT_REGEX_XREF);
+            $fact_id = Filter::get('fact_id');
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            check_record_access($record);
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'edit':
-        $xref    = Filter::get('xref', WT_REGEX_XREF);
-        $fact_id = Filter::get('fact_id');
-
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        check_record_access($record);
-
-        // Find the fact to edit
-        $edit_fact = null;
-        foreach ($record->getFacts() as $fact) {
-            if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
-                $edit_fact = $fact;
-                break;
+            // Find the fact to edit
+            $edit_fact = null;
+            foreach ($record->getFacts() as $fact) {
+                if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
+                    $edit_fact = $fact;
+                    break;
+                }
             }
-        }
-        if (!$edit_fact) {
-            $controller
-            ->pageHeader()
-            ->addInlineJavascript('closePopupAndReloadParent();');
+            if (!$edit_fact) {
+                $controller
+                ->pageHeader()
+                ->addInlineJavascript('closePopupAndReloadParent();');
 
-            return;
-        }
+                return;
+            }
 
-        $controller
-        ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit'))
-        ->pageHeader();
-
-        echo '<div id="edit_interface-page">';
-        echo '<h2>', $controller->getPageTitle(), '</h2>';
-        FunctionsPrint::initializeCalendarPopup();
-        echo '<form name="editform" method="post" action="edit_interface.php" enctype="multipart/form-data">';
-        echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
-        echo '<input type="hidden" name="action" value="update">';
-        echo '<input type="hidden" name="fact_id" value="', $fact_id, '">';
-        echo '<input type="hidden" name="xref" value="', $xref, '">';
-        echo '<input type="hidden" name="prev_action" value="edit">';
-        echo Filter::getCsrf();
-        echo '<table class="facts_table">';
-        FunctionsEdit::createEditForm($edit_fact);
-        echo keep_chan($record);
-        echo '</table>';
-
-        $level1type = $edit_fact->getTag();
-        switch ($record::RECORD_TYPE) {
+            $controller
+            ->setPageTitle($record->getFullName() . ' - ' . I18N::translate('Edit'))
+            ->pageHeader();
+
+            echo '<div id="edit_interface-page">';
+            echo '<h2>', $controller->getPageTitle(), '</h2>';
+            FunctionsPrint::initializeCalendarPopup();
+            echo '<form name="editform" method="post" action="edit_interface.php" enctype="multipart/form-data">';
+            echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
+            echo '<input type="hidden" name="action" value="update">';
+            echo '<input type="hidden" name="fact_id" value="', $fact_id, '">';
+            echo '<input type="hidden" name="xref" value="', $xref, '">';
+            echo '<input type="hidden" name="prev_action" value="edit">';
+            echo Filter::getCsrf();
+            echo '<table class="facts_table">';
+            FunctionsEdit::createEditForm($edit_fact);
+            echo keep_chan($record);
+            echo '</table>';
+
+            $level1type = $edit_fact->getTag();
+            switch ($record::RECORD_TYPE) {
             case 'REPO':
                 // REPO:NAME facts may take a NOTE (but the REPO record may not).
                 if ($level1type === 'NAME') {
@@ -312,7 +312,7 @@ 
             default:
                 // Other types of record do not have these lower-level records
             break;
-        }
+            }
         if (Auth::isAdmin() || $WT_TREE->getPreference('SHOW_GEDCOM_RECORD')) {
             echo
             '<br><br><a href="edit_interface.php?action=editrawfact&amp;xref=', $xref, '&amp;fact_id=', $fact_id, '&amp;ged=', $WT_TREE->getNameUrl(), '">',
@@ -330,57 +330,57 @@ 
         break;
 
 ////////////////////////////////////////////////////////////////////////////////
-    case 'add':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
-        $fact = Filter::get('fact', WT_REGEX_TAG);
+        case 'add':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
+            $fact = Filter::get('fact', WT_REGEX_TAG);
 
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        check_record_access($record);
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            check_record_access($record);
 
-        $controller
-        ->setPageTitle($record->getFullName() . ' - ' . GedcomTag::getLabel($fact, $record))
-        ->pageHeader();
-
-        $level0type = $record::RECORD_TYPE;
-
-        echo '<div id="edit_interface-page">';
-        echo '<h2>', $controller->getPageTitle(), '</h2>';
-
-        FunctionsPrint::initializeCalendarPopup();
-        echo '<form name="addform" method="post" action="edit_interface.php" enctype="multipart/form-data">';
-        echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
-        echo '<input type="hidden" name="action" value="update">';
-        echo '<input type="hidden" name="xref" value="', $xref, '">';
-        echo '<input type="hidden" name="prev_action" value="add">';
-        echo '<input type="hidden" name="fact_type" value="' . $fact . '">';
-        echo Filter::getCsrf();
-        echo '<table class="facts_table">';
-
-        FunctionsEdit::createAddForm($fact);
-
-        echo keep_chan($record);
-        echo '</table>';
-
-        // Genealogical facts (e.g. for INDI and FAM records) can have 2 SOUR/NOTE/OBJE/ASSO/RESN ...
-        if ($level0type === 'INDI' || $level0type === 'FAM') {
-            // ... but not facts which are simply links to other records
-            if ($fact !== 'OBJE' && $fact !== 'NOTE' && $fact !== 'SHARED_NOTE' && $fact !== 'REPO' && $fact !== 'SOUR' && $fact !== 'ASSO' && $fact !== 'ALIA') {
-                FunctionsEdit::printAddLayer('SOUR');
-                FunctionsEdit::printAddLayer('OBJE');
-                // Don’t add notes to notes!
-                if ($fact !== 'NOTE') {
-                    FunctionsEdit::printAddLayer('NOTE');
-                    FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $fact);
-                }
-                FunctionsEdit::printAddLayer('ASSO');
-                // allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
-                if (in_array($fact, Config::twoAssociates())) {
-                    FunctionsEdit::printAddLayer('ASSO2');
+            $controller
+            ->setPageTitle($record->getFullName() . ' - ' . GedcomTag::getLabel($fact, $record))
+            ->pageHeader();
+
+            $level0type = $record::RECORD_TYPE;
+
+            echo '<div id="edit_interface-page">';
+            echo '<h2>', $controller->getPageTitle(), '</h2>';
+
+            FunctionsPrint::initializeCalendarPopup();
+            echo '<form name="addform" method="post" action="edit_interface.php" enctype="multipart/form-data">';
+            echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
+            echo '<input type="hidden" name="action" value="update">';
+            echo '<input type="hidden" name="xref" value="', $xref, '">';
+            echo '<input type="hidden" name="prev_action" value="add">';
+            echo '<input type="hidden" name="fact_type" value="' . $fact . '">';
+            echo Filter::getCsrf();
+            echo '<table class="facts_table">';
+
+            FunctionsEdit::createAddForm($fact);
+
+            echo keep_chan($record);
+            echo '</table>';
+
+            // Genealogical facts (e.g. for INDI and FAM records) can have 2 SOUR/NOTE/OBJE/ASSO/RESN ...
+            if ($level0type === 'INDI' || $level0type === 'FAM') {
+                // ... but not facts which are simply links to other records
+                if ($fact !== 'OBJE' && $fact !== 'NOTE' && $fact !== 'SHARED_NOTE' && $fact !== 'REPO' && $fact !== 'SOUR' && $fact !== 'ASSO' && $fact !== 'ALIA') {
+                    FunctionsEdit::printAddLayer('SOUR');
+                    FunctionsEdit::printAddLayer('OBJE');
+                    // Don’t add notes to notes!
+                    if ($fact !== 'NOTE') {
+                        FunctionsEdit::printAddLayer('NOTE');
+                        FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $fact);
+                    }
+                    FunctionsEdit::printAddLayer('ASSO');
+                    // allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
+                    if (in_array($fact, Config::twoAssociates())) {
+                        FunctionsEdit::printAddLayer('ASSO2');
+                    }
+                    FunctionsEdit::printAddLayer('RESN');
                 }
-                FunctionsEdit::printAddLayer('RESN');
             }
-        }
-        ?>
+            ?>
         <p id="save-cancel">
             <input type="submit" class="save" value="<?php echo I18N::translate('save'); ?>">
             <input type="button" class="cancel" value="<?php echo I18N::translate('close'); ?>" onclick="window.close();">
@@ -388,582 +388,582 @@ 
     </form>
     </div>
         <?php
-        break;
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'update':
-        // Update a fact
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id   = Filter::post('fact_id');
-        $keep_chan = Filter::postBool('keep_chan');
-
-        if (!Filter::checkCsrf()) {
-            $prev_action = Filter::post('prev_action', 'add|edit|addname|editname');
-            $fact_type   = Filter::post('fact_type', WT_REGEX_TAG);
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=' . $prev_action . '&xref=' . $xref . '&fact_id=' . $fact_id . '&fact=' . $fact_type);
-
-            return;
-        }
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'update':
+            // Update a fact
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id   = Filter::post('fact_id');
+            $keep_chan = Filter::postBool('keep_chan');
 
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        check_record_access($record);
+            if (!Filter::checkCsrf()) {
+                $prev_action = Filter::post('prev_action', 'add|edit|addname|editname');
+                $fact_type   = Filter::post('fact_type', WT_REGEX_TAG);
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=' . $prev_action . '&xref=' . $xref . '&fact_id=' . $fact_id . '&fact=' . $fact_type);
 
-        // Arrays for each GEDCOM line
-        $glevels = Filter::postArray('glevels', '[0-9]');
-        $tag     = Filter::postArray('tag', WT_REGEX_TAG);
-        $text    = Filter::postArray('text');
-        $islink  = Filter::postArray('islink', '[01]');
+                return;
+            }
 
-        $controller
-        ->setPageTitle(I18N::translate('Edit'))
-        ->pageHeader();
-
-        // If the fact has a DATE or PLAC, then delete any value of Y
-        if ($text[0] === 'Y') {
-            for ($n = 1; $n < count($tag); ++$n) {
-                if ($glevels[$n] == 2 && ($tag[$n] === 'DATE' || $tag[$n] === 'PLAC') && $text[$n]) {
-                    $text[0] = '';
-                    break;
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            check_record_access($record);
+
+            // Arrays for each GEDCOM line
+            $glevels = Filter::postArray('glevels', '[0-9]');
+            $tag     = Filter::postArray('tag', WT_REGEX_TAG);
+            $text    = Filter::postArray('text');
+            $islink  = Filter::postArray('islink', '[01]');
+
+            $controller
+            ->setPageTitle(I18N::translate('Edit'))
+            ->pageHeader();
+
+            // If the fact has a DATE or PLAC, then delete any value of Y
+            if ($text[0] === 'Y') {
+                for ($n = 1; $n < count($tag); ++$n) {
+                    if ($glevels[$n] == 2 && ($tag[$n] === 'DATE' || $tag[$n] === 'PLAC') && $text[$n]) {
+                        $text[0] = '';
+                        break;
+                    }
                 }
             }
-        }
 
-        $newged = '';
-        if (!empty($_POST['NAME'])) {
-            $newged .= "\n1 NAME " . $_POST['NAME'];
-            $name_facts = array('TYPE', 'NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX');
-            foreach ($name_facts as $name_fact) {
-                if (!empty($_POST[$name_fact])) {
-                    $newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+            $newged = '';
+            if (!empty($_POST['NAME'])) {
+                $newged .= "\n1 NAME " . $_POST['NAME'];
+                $name_facts = array('TYPE', 'NPFX', 'GIVN', 'SPFX', 'SURN', 'NSFX');
+                foreach ($name_facts as $name_fact) {
+                    if (!empty($_POST[$name_fact])) {
+                        $newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+                    }
                 }
             }
-        }
 
-        if (isset($_POST['NOTE'])) {
-            $NOTE = $_POST['NOTE'];
-        }
-        if (!empty($NOTE)) {
-            $tempnote = preg_split('/\r?\n/', trim($NOTE) . "\n"); // make sure only one line ending on the end
-            $title[]  = '0 @' . $xref . '@ NOTE ' . array_shift($tempnote);
-            foreach ($tempnote as &$line) {
-                $line = trim('1 CONT ' . $line, ' ');
+            if (isset($_POST['NOTE'])) {
+                $NOTE = $_POST['NOTE'];
+            }
+            if (!empty($NOTE)) {
+                $tempnote = preg_split('/\r?\n/', trim($NOTE) . "\n"); // make sure only one line ending on the end
+                $title[]  = '0 @' . $xref . '@ NOTE ' . array_shift($tempnote);
+                foreach ($tempnote as &$line) {
+                    $line = trim('1 CONT ' . $line, ' ');
+                }
             }
-        }
 
-        $newged = FunctionsEdit::handleUpdates($newged);
+            $newged = FunctionsEdit::handleUpdates($newged);
 
-        // Add new names after existing names
-        if (!empty($_POST['NAME'])) {
-            preg_match_all('/[_0-9A-Z]+/', $WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $match);
-            $name_facts = array_unique(array_merge(array('_MARNM'), $match[0]));
-            foreach ($name_facts as $name_fact) {
-                if (!empty($_POST[$name_fact])) {
-                    $newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+            // Add new names after existing names
+            if (!empty($_POST['NAME'])) {
+                preg_match_all('/[_0-9A-Z]+/', $WT_TREE->getPreference('ADVANCED_NAME_FACTS'), $match);
+                $name_facts = array_unique(array_merge(array('_MARNM'), $match[0]));
+                foreach ($name_facts as $name_fact) {
+                    if (!empty($_POST[$name_fact])) {
+                        $newged .= "\n2 " . $name_fact . ' ' . $_POST[$name_fact];
+                    }
                 }
             }
-        }
 
-        $newged = substr($newged, 1); // Remove leading newline
-        $record->updateFact($fact_id, $newged, !$keep_chan);
-
-        // For the GEDFact_assistant module
-        $pid_array = Filter::post('pid_array');
-        if ($pid_array) {
-            foreach (explode(',', $pid_array) as $pid) {
-                if ($pid !== $xref) {
-                    $indi = Individual::getInstance($pid, $WT_TREE);
-                    if ($indi && $indi->canEdit()) {
-                        $indi->updateFact($fact_id, $newged, !$keep_chan);
+            $newged = substr($newged, 1); // Remove leading newline
+            $record->updateFact($fact_id, $newged, !$keep_chan);
+
+            // For the GEDFact_assistant module
+            $pid_array = Filter::post('pid_array');
+            if ($pid_array) {
+                foreach (explode(',', $pid_array) as $pid) {
+                    if ($pid !== $xref) {
+                        $indi = Individual::getInstance($pid, $WT_TREE);
+                        if ($indi && $indi->canEdit()) {
+                            $indi->updateFact($fact_id, $newged, !$keep_chan);
+                        }
                     }
                 }
             }
-        }
-
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
-
-////////////////////////////////////////////////////////////////////////////////
-// Add a child to an existing family
-////////////////////////////////////////////////////////////////////////////////
-    case 'add_child_to_family':
-        $xref   = Filter::get('xref', WT_REGEX_XREF);
-        $gender = Filter::get('gender', '[MFU]', 'U');
 
-        $family = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-        $controller
-        ->setPageTitle($family->getFullName() . ' - ' . I18N::translate('Add a child'))
-        ->pageHeader();
+    ////////////////////////////////////////////////////////////////////////////////
+    // Add a child to an existing family
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'add_child_to_family':
+            $xref   = Filter::get('xref', WT_REGEX_XREF);
+            $gender = Filter::get('gender', '[MFU]', 'U');
 
-        print_indi_form('add_child_to_family_action', null, $family, null, 'CHIL', $gender);
-        break;
+            $family = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-    case 'add_child_to_family_action':
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $PEDI      = Filter::post('PEDI');
-        $keep_chan = Filter::postBool('keep_chan');
-        $glevels   = Filter::postArray('glevels', '[0-9]');
-        $tag       = Filter::postArray('tag', WT_REGEX_TAG);
-        $text      = Filter::postArray('text');
-        $islink    = Filter::postArray('islink', '[01]');
+            $controller
+            ->setPageTitle($family->getFullName() . ' - ' . I18N::translate('Add a child'))
+            ->pageHeader();
 
-        if (!Filter::checkCsrf()) {
-            $gender = Filter::get('gender', '[MFU]', 'U');
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_child_to_family&xref=' . $xref . '&gender=' . $gender);
+            print_indi_form('add_child_to_family_action', null, $family, null, 'CHIL', $gender);
+            break;
 
-            return;
-        }
+        case 'add_child_to_family_action':
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $PEDI      = Filter::post('PEDI');
+            $keep_chan = Filter::postBool('keep_chan');
+            $glevels   = Filter::postArray('glevels', '[0-9]');
+            $tag       = Filter::postArray('tag', WT_REGEX_TAG);
+            $text      = Filter::postArray('text');
+            $islink    = Filter::postArray('islink', '[01]');
+
+            if (!Filter::checkCsrf()) {
+                $gender = Filter::get('gender', '[MFU]', 'U');
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_child_to_family&xref=' . $xref . '&gender=' . $gender);
+
+                return;
+            }
 
-        $family = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $family = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-        $controller->pageHeader();
+            $controller->pageHeader();
 
-        FunctionsEdit::splitSource();
-        $gedrec = '0 @REF@ INDI';
-        $gedrec .= FunctionsEdit::addNewName();
-        $gedrec .= FunctionsEdit::addNewSex();
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $gedrec .= FunctionsEdit::addNewFact($match);
+            FunctionsEdit::splitSource();
+            $gedrec = '0 @REF@ INDI';
+            $gedrec .= FunctionsEdit::addNewName();
+            $gedrec .= FunctionsEdit::addNewSex();
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $gedrec .= FunctionsEdit::addNewFact($match);
+                }
+            }
+            $gedrec .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $xref);
+            if (Filter::postBool('SOUR_INDI')) {
+                $gedrec = FunctionsEdit::handleUpdates($gedrec);
+            } else {
+                $gedrec = FunctionsEdit::updateRest($gedrec);
             }
-        }
-        $gedrec .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $xref);
-        if (Filter::postBool('SOUR_INDI')) {
-            $gedrec = FunctionsEdit::handleUpdates($gedrec);
-        } else {
-            $gedrec = FunctionsEdit::updateRest($gedrec);
-        }
 
-        // Create the new child
-        $new_child = $family->getTree()->createRecord($gedrec);
-
-        // Insert new child at the right place
-        $done = false;
-        foreach ($family->getFacts('CHIL') as $fact) {
-            $old_child = $fact->getTarget();
-            if ($old_child && Date::compare($new_child->getEstimatedBirthDate(), $old_child->getEstimatedBirthDate()) < 0) {
-                // Insert before this child
-                $family->updateFact($fact->getFactId(), '1 CHIL @' . $new_child->getXref() . "@\n" . $fact->getGedcom(), !$keep_chan);
-                $done = true;
-                break;
+            // Create the new child
+            $new_child = $family->getTree()->createRecord($gedrec);
+
+            // Insert new child at the right place
+            $done = false;
+            foreach ($family->getFacts('CHIL') as $fact) {
+                $old_child = $fact->getTarget();
+                if ($old_child && Date::compare($new_child->getEstimatedBirthDate(), $old_child->getEstimatedBirthDate()) < 0) {
+                    // Insert before this child
+                    $family->updateFact($fact->getFactId(), '1 CHIL @' . $new_child->getXref() . "@\n" . $fact->getGedcom(), !$keep_chan);
+                    $done = true;
+                    break;
+                }
+            }
+            if (!$done) {
+                // Append child at end
+                $family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
             }
-        }
-        if (!$done) {
-            // Append child at end
-            $family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
-        }
 
-        if (Filter::post('goto') === 'new') {
-            $controller->addInlineJavascript('closePopupAndReloadParent("' . $new_child->getRawUrl() . '");');
-        } else {
-            $controller->addInlineJavascript('closePopupAndReloadParent();');
-        }
-        break;
+            if (Filter::post('goto') === 'new') {
+                $controller->addInlineJavascript('closePopupAndReloadParent("' . $new_child->getRawUrl() . '");');
+            } else {
+                $controller->addInlineJavascript('closePopupAndReloadParent();');
+            }
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Add a child to an existing individual (creating a one-parent family)
-////////////////////////////////////////////////////////////////////////////////
-    case 'add_child_to_individual':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+    // Add a child to an existing individual (creating a one-parent family)
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'add_child_to_individual':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a child to create a one-parent family'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a child to create a one-parent family'))
+            ->pageHeader();
 
-        print_indi_form('add_child_to_individual_action', $person, null, null, 'CHIL', $person->getSex());
-        break;
+            print_indi_form('add_child_to_individual_action', $person, null, null, 'CHIL', $person->getSex());
+            break;
 
-    case 'add_child_to_individual_action':
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $PEDI    = Filter::post('PEDI');
-        $glevels = Filter::postArray('glevels', '[0-9]');
-        $tag     = Filter::postArray('tag', WT_REGEX_TAG);
-        $text    = Filter::postArray('text');
-        $islink  = Filter::postArray('islink', '[01]');
+        case 'add_child_to_individual_action':
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $PEDI    = Filter::post('PEDI');
+            $glevels = Filter::postArray('glevels', '[0-9]');
+            $tag     = Filter::postArray('tag', WT_REGEX_TAG);
+            $text    = Filter::postArray('text');
+            $islink  = Filter::postArray('islink', '[01]');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_child_to_individual&xref=' . $xref);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_child_to_individual&xref=' . $xref);
 
-            return;
-        }
+                return;
+            }
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller->pageHeader();
+            $controller->pageHeader();
 
-        // Create a family
-        if ($person->getSex() === 'F') {
-            $gedcom = "0 @NEW@ FAM\n1 WIFE @" . $person->getXref() . '@';
-        } else {
-            $gedcom = "0 @NEW@ FAM\n1 HUSB @" . $person->getXref() . '@';
-        }
-        $family = $person->getTree()->createRecord($gedcom);
+            // Create a family
+            if ($person->getSex() === 'F') {
+                $gedcom = "0 @NEW@ FAM\n1 WIFE @" . $person->getXref() . '@';
+            } else {
+                $gedcom = "0 @NEW@ FAM\n1 HUSB @" . $person->getXref() . '@';
+            }
+            $family = $person->getTree()->createRecord($gedcom);
 
-        // Link the parent to the family
-        $person->createFact('1 FAMS @' . $family->getXref() . '@', true);
+            // Link the parent to the family
+            $person->createFact('1 FAMS @' . $family->getXref() . '@', true);
 
-        // Create a child
-        FunctionsEdit::splitSource(); // separate SOUR record from the rest
+            // Create a child
+            FunctionsEdit::splitSource(); // separate SOUR record from the rest
 
-        $gedcom = '0 @NEW@ INDI';
-        $gedcom .= FunctionsEdit::addNewName();
-        $gedcom .= FunctionsEdit::addNewSex();
-        $gedcom .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $family->getXref());
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $gedcom .= FunctionsEdit::addNewFact($match);
+            $gedcom = '0 @NEW@ INDI';
+            $gedcom .= FunctionsEdit::addNewName();
+            $gedcom .= FunctionsEdit::addNewSex();
+            $gedcom .= "\n" . GedcomCodePedi::createNewFamcPedi($PEDI, $family->getXref());
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $gedcom .= FunctionsEdit::addNewFact($match);
+                }
+            }
+            if (Filter::postBool('SOUR_INDI')) {
+                $gedcom = FunctionsEdit::handleUpdates($gedcom);
+            } else {
+                $gedcom = FunctionsEdit::updateRest($gedcom);
             }
-        }
-        if (Filter::postBool('SOUR_INDI')) {
-            $gedcom = FunctionsEdit::handleUpdates($gedcom);
-        } else {
-            $gedcom = FunctionsEdit::updateRest($gedcom);
-        }
 
-        $child = $person->getTree()->createRecord($gedcom);
+            $child = $person->getTree()->createRecord($gedcom);
 
-        // Link the family to the child
-        $family->createFact('1 CHIL @' . $child->getXref() . '@', true);
+            // Link the family to the child
+            $family->createFact('1 CHIL @' . $child->getXref() . '@', true);
 
-        if (Filter::post('goto') === 'new') {
-            $controller->addInlineJavascript('closePopupAndReloadParent("' . $child->getRawUrl() . '");');
-        } else {
-            $controller->addInlineJavascript('closePopupAndReloadParent();');
-        }
-        break;
+            if (Filter::post('goto') === 'new') {
+                $controller->addInlineJavascript('closePopupAndReloadParent("' . $child->getRawUrl() . '");');
+            } else {
+                $controller->addInlineJavascript('closePopupAndReloadParent();');
+            }
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Add a new parent to an existing individual (creating a one-parent family)
-////////////////////////////////////////////////////////////////////////////////
-    case 'add_parent_to_individual':
-        $xref   = Filter::get('xref', WT_REGEX_XREF);
-        $gender = Filter::get('gender', '[MF]', 'U');
+    ////////////////////////////////////////////////////////////////////////////////
+    // Add a new parent to an existing individual (creating a one-parent family)
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'add_parent_to_individual':
+            $xref   = Filter::get('xref', WT_REGEX_XREF);
+            $gender = Filter::get('gender', '[MF]', 'U');
 
-        $individual = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($individual);
+            $individual = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($individual);
 
-        if ($gender === 'F') {
-            $controller->setPageTitle(I18N::translate('Add a mother'));
-            $famtag = 'WIFE';
-        } else {
-            $controller->setPageTitle(I18N::translate('Add a father'));
-            $famtag = 'HUSB';
-        }
-        $controller->pageHeader();
+            if ($gender === 'F') {
+                $controller->setPageTitle(I18N::translate('Add a mother'));
+                $famtag = 'WIFE';
+            } else {
+                $controller->setPageTitle(I18N::translate('Add a father'));
+                $famtag = 'HUSB';
+            }
+            $controller->pageHeader();
 
-        print_indi_form('add_parent_to_individual_action', $individual, null, null, $famtag, $gender);
-        break;
+            print_indi_form('add_parent_to_individual_action', $individual, null, null, $famtag, $gender);
+            break;
 
-    case 'add_parent_to_individual_action':
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $PEDI    = Filter::post('PEDI');
-        $glevels = Filter::postArray('glevels', '[0-9]');
-        $tag     = Filter::postArray('tag', WT_REGEX_TAG);
-        $text    = Filter::postArray('text');
-        $islink  = Filter::postArray('islink', '[01]');
+        case 'add_parent_to_individual_action':
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $PEDI    = Filter::post('PEDI');
+            $glevels = Filter::postArray('glevels', '[0-9]');
+            $tag     = Filter::postArray('tag', WT_REGEX_TAG);
+            $text    = Filter::postArray('text');
+            $islink  = Filter::postArray('islink', '[01]');
 
-        if (!Filter::checkCsrf()) {
-            $gender = Filter::get('gender', '[MFU]', 'U');
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_parent_to_individual&xref=' . $xref . '&gender=' . $gender);
+            if (!Filter::checkCsrf()) {
+                $gender = Filter::get('gender', '[MFU]', 'U');
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_parent_to_individual&xref=' . $xref . '&gender=' . $gender);
 
-            return;
-        }
+                return;
+            }
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller->pageHeader();
+            $controller->pageHeader();
 
-        // Create a new family
-        $gedcom = "0 @NEW@ FAM\n1 CHIL @" . $person->getXref() . '@';
-        $family = $person->getTree()->createRecord($gedcom);
+            // Create a new family
+            $gedcom = "0 @NEW@ FAM\n1 CHIL @" . $person->getXref() . '@';
+            $family = $person->getTree()->createRecord($gedcom);
 
-        // Link the child to the family
-        $person->createFact('1 FAMC @' . $family->getXref() . '@', true);
+            // Link the child to the family
+            $person->createFact('1 FAMC @' . $family->getXref() . '@', true);
 
-        // Create a child
-        FunctionsEdit::splitSource(); // separate SOUR record from the rest
+            // Create a child
+            FunctionsEdit::splitSource(); // separate SOUR record from the rest
 
-        $gedcom = '0 @NEW@ INDI';
-        $gedcom .= FunctionsEdit::addNewName();
-        $gedcom .= FunctionsEdit::addNewSex();
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $gedcom .= FunctionsEdit::addNewFact($match);
+            $gedcom = '0 @NEW@ INDI';
+            $gedcom .= FunctionsEdit::addNewName();
+            $gedcom .= FunctionsEdit::addNewSex();
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $gedcom .= FunctionsEdit::addNewFact($match);
+                }
             }
-        }
-        if (Filter::postBool('SOUR_INDI')) {
-            $gedcom = FunctionsEdit::handleUpdates($gedcom);
-        } else {
-            $gedcom = FunctionsEdit::updateRest($gedcom);
-        }
-        $gedcom .= "\n1 FAMS @" . $family->getXref() . '@';
+            if (Filter::postBool('SOUR_INDI')) {
+                $gedcom = FunctionsEdit::handleUpdates($gedcom);
+            } else {
+                $gedcom = FunctionsEdit::updateRest($gedcom);
+            }
+            $gedcom .= "\n1 FAMS @" . $family->getXref() . '@';
 
-        $parent = $person->getTree()->createRecord($gedcom);
+            $parent = $person->getTree()->createRecord($gedcom);
 
-        // Link the family to the child
-        if ($parent->getSex() === 'F') {
-            $family->createFact('1 WIFE @' . $parent->getXref() . '@', true);
-        } else {
-            $family->createFact('1 HUSB @' . $parent->getXref() . '@', true);
-        }
+            // Link the family to the child
+            if ($parent->getSex() === 'F') {
+                $family->createFact('1 WIFE @' . $parent->getXref() . '@', true);
+            } else {
+                $family->createFact('1 HUSB @' . $parent->getXref() . '@', true);
+            }
 
-        if (Filter::post('goto') === 'new') {
-            $controller->addInlineJavascript('closePopupAndReloadParent("' . $parent->getRawUrl() . '");');
-        } else {
-            $controller->addInlineJavascript('closePopupAndReloadParent();');
-        }
-        break;
+            if (Filter::post('goto') === 'new') {
+                $controller->addInlineJavascript('closePopupAndReloadParent("' . $parent->getRawUrl() . '");');
+            } else {
+                $controller->addInlineJavascript('closePopupAndReloadParent();');
+            }
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Add a new, unlinked individual
-////////////////////////////////////////////////////////////////////////////////
-    case 'add_unlinked_indi':
-        $controller
-        ->restrictAccess(Auth::isManager($WT_TREE))
-        ->setPageTitle(I18N::translate('Create an individual'))
-        ->pageHeader();
+    ////////////////////////////////////////////////////////////////////////////////
+    // Add a new, unlinked individual
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'add_unlinked_indi':
+            $controller
+            ->restrictAccess(Auth::isManager($WT_TREE))
+            ->setPageTitle(I18N::translate('Create an individual'))
+            ->pageHeader();
 
-        print_indi_form('add_unlinked_indi_action', null, null, null, null, null);
-        break;
+            print_indi_form('add_unlinked_indi_action', null, null, null, null, null);
+            break;
 
-    case 'add_unlinked_indi_action':
-        $glevels = Filter::postArray('glevels', '[0-9]');
-        $tag     = Filter::postArray('tag', WT_REGEX_TAG);
-        $text    = Filter::postArray('text');
-        $islink  = Filter::postArray('islink', '[01]');
+        case 'add_unlinked_indi_action':
+            $glevels = Filter::postArray('glevels', '[0-9]');
+            $tag     = Filter::postArray('tag', WT_REGEX_TAG);
+            $text    = Filter::postArray('text');
+            $islink  = Filter::postArray('islink', '[01]');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_unlinked_indi');
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_unlinked_indi');
 
-            return;
-        }
+                return;
+            }
 
-        $controller
-        ->restrictAccess(Auth::isManager($WT_TREE))
-        ->pageHeader();
-
-        FunctionsEdit::splitSource();
-        $gedrec = '0 @REF@ INDI';
-        $gedrec .= FunctionsEdit::addNewName();
-        $gedrec .= FunctionsEdit::addNewSex();
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $gedrec .= FunctionsEdit::addNewFact($match);
+            $controller
+            ->restrictAccess(Auth::isManager($WT_TREE))
+            ->pageHeader();
+
+            FunctionsEdit::splitSource();
+            $gedrec = '0 @REF@ INDI';
+            $gedrec .= FunctionsEdit::addNewName();
+            $gedrec .= FunctionsEdit::addNewSex();
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $gedrec .= FunctionsEdit::addNewFact($match);
+                }
+            }
+            if (Filter::postBool('SOUR_INDI')) {
+                $gedrec = FunctionsEdit::handleUpdates($gedrec);
+            } else {
+                $gedrec = FunctionsEdit::updateRest($gedrec);
             }
-        }
-        if (Filter::postBool('SOUR_INDI')) {
-            $gedrec = FunctionsEdit::handleUpdates($gedrec);
-        } else {
-            $gedrec = FunctionsEdit::updateRest($gedrec);
-        }
 
-        $new_indi = $WT_TREE->createRecord($gedrec);
+            $new_indi = $WT_TREE->createRecord($gedrec);
 
-        if (Filter::post('goto') === 'new') {
-            $controller->addInlineJavascript('closePopupAndReloadParent("' . $new_indi->getRawUrl() . '");');
-        } else {
-            $controller->addInlineJavascript('closePopupAndReloadParent();');
-        }
-        break;
+            if (Filter::post('goto') === 'new') {
+                $controller->addInlineJavascript('closePopupAndReloadParent("' . $new_indi->getRawUrl() . '");');
+            } else {
+                $controller->addInlineJavascript('closePopupAndReloadParent();');
+            }
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Add a spouse to an existing individual (creating a new family)
-////////////////////////////////////////////////////////////////////////////////
-    case 'add_spouse_to_individual':
-        $famtag = Filter::get('famtag', 'HUSB|WIFE');
-        $xref   = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+    // Add a spouse to an existing individual (creating a new family)
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'add_spouse_to_individual':
+            $famtag = Filter::get('famtag', 'HUSB|WIFE');
+            $xref   = Filter::get('xref', WT_REGEX_XREF);
 
-        $individual = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($individual);
+            $individual = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($individual);
 
-        if ($famtag === 'WIFE') {
-            $controller->setPageTitle(I18N::translate('Add a wife'));
-            $sex = 'F';
-        } else {
-            $controller->setPageTitle(I18N::translate('Add a husband'));
-            $sex = 'M';
-        }
-        $controller->pageHeader();
+            if ($famtag === 'WIFE') {
+                $controller->setPageTitle(I18N::translate('Add a wife'));
+                $sex = 'F';
+            } else {
+                $controller->setPageTitle(I18N::translate('Add a husband'));
+                $sex = 'M';
+            }
+            $controller->pageHeader();
 
-        print_indi_form('add_spouse_to_individual_action', $individual, null, null, $famtag, $sex);
-        break;
+            print_indi_form('add_spouse_to_individual_action', $individual, null, null, $famtag, $sex);
+            break;
 
-    case 'add_spouse_to_individual_action':
-        $xref    = Filter::post('xref'); // Add a spouse to this individual
-        $sex     = Filter::post('SEX', '[MFU]', 'U');
-        $glevels = Filter::postArray('glevels', '[0-9]');
-        $tag     = Filter::postArray('tag', WT_REGEX_TAG);
-        $text    = Filter::postArray('text');
-        $islink  = Filter::postArray('islink', '[01]');
+        case 'add_spouse_to_individual_action':
+            $xref    = Filter::post('xref'); // Add a spouse to this individual
+            $sex     = Filter::post('SEX', '[MFU]', 'U');
+            $glevels = Filter::postArray('glevels', '[0-9]');
+            $tag     = Filter::postArray('tag', WT_REGEX_TAG);
+            $text    = Filter::postArray('text');
+            $islink  = Filter::postArray('islink', '[01]');
 
-        if (!Filter::checkCsrf()) {
-            $famtag = Filter::get('famtag', 'HUSB|WIFE');
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_spouse_to_individual&xref=' . $xref . '&famtag=' . $famtag);
+            if (!Filter::checkCsrf()) {
+                $famtag = Filter::get('famtag', 'HUSB|WIFE');
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_spouse_to_individual&xref=' . $xref . '&famtag=' . $famtag);
 
-            return;
-        }
+                return;
+            }
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->setPageTitle(I18N::translate('Add a spouse'))
-        ->pageHeader();
-
-        FunctionsEdit::splitSource();
-        $indi_gedcom = '0 @REF@ INDI';
-        $indi_gedcom .= FunctionsEdit::addNewName();
-        $indi_gedcom .= FunctionsEdit::addNewSex();
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $indi_gedcom .= FunctionsEdit::addNewFact($match);
+            $controller
+            ->setPageTitle(I18N::translate('Add a spouse'))
+            ->pageHeader();
+
+            FunctionsEdit::splitSource();
+            $indi_gedcom = '0 @REF@ INDI';
+            $indi_gedcom .= FunctionsEdit::addNewName();
+            $indi_gedcom .= FunctionsEdit::addNewSex();
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $indi_gedcom .= FunctionsEdit::addNewFact($match);
+                }
+            }
+            if (Filter::postBool('SOUR_INDI')) {
+                $indi_gedcom = FunctionsEdit::handleUpdates($indi_gedcom);
+            } else {
+                $indi_gedcom = FunctionsEdit::updateRest($indi_gedcom);
             }
-        }
-        if (Filter::postBool('SOUR_INDI')) {
-            $indi_gedcom = FunctionsEdit::handleUpdates($indi_gedcom);
-        } else {
-            $indi_gedcom = FunctionsEdit::updateRest($indi_gedcom);
-        }
 
-        $fam_gedcom = '';
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $fam_gedcom .= FunctionsEdit::addNewFact($match);
+            $fam_gedcom = '';
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $fam_gedcom .= FunctionsEdit::addNewFact($match);
+                }
+            }
+            if (Filter::postBool('SOUR_FAM')) {
+                $fam_gedcom = FunctionsEdit::handleUpdates($fam_gedcom);
+            } else {
+                $fam_gedcom = FunctionsEdit::updateRest($fam_gedcom);
             }
-        }
-        if (Filter::postBool('SOUR_FAM')) {
-            $fam_gedcom = FunctionsEdit::handleUpdates($fam_gedcom);
-        } else {
-            $fam_gedcom = FunctionsEdit::updateRest($fam_gedcom);
-        }
 
-        // Create the new spouse
-        $spouse = $person->getTree()->createRecord($indi_gedcom);
-        // Create a new family
-        if ($sex === 'F') {
-            $family = $spouse->getTree()->createRecord("0 @NEW@ FAM\n1 WIFE @" . $spouse->getXref() . "@\n1 HUSB @" . $person->getXref() . '@' . $fam_gedcom);
-        } else {
-            $family = $spouse->getTree()->createRecord("0 @NEW@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@' . $fam_gedcom);
-        }
-        // Link the spouses to the family
-        $spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
-        $person->createFact('1 FAMS @' . $family->getXref() . '@', true);
+            // Create the new spouse
+            $spouse = $person->getTree()->createRecord($indi_gedcom);
+            // Create a new family
+            if ($sex === 'F') {
+                $family = $spouse->getTree()->createRecord("0 @NEW@ FAM\n1 WIFE @" . $spouse->getXref() . "@\n1 HUSB @" . $person->getXref() . '@' . $fam_gedcom);
+            } else {
+                $family = $spouse->getTree()->createRecord("0 @NEW@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@' . $fam_gedcom);
+            }
+            // Link the spouses to the family
+            $spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
+            $person->createFact('1 FAMS @' . $family->getXref() . '@', true);
 
-        if (Filter::post('goto') === 'new') {
-            $controller->addInlineJavascript('closePopupAndReloadParent("' . $spouse->getRawUrl() . '");');
-        } else {
-            $controller->addInlineJavascript('closePopupAndReloadParent();');
-        }
-        break;
+            if (Filter::post('goto') === 'new') {
+                $controller->addInlineJavascript('closePopupAndReloadParent("' . $spouse->getRawUrl() . '");');
+            } else {
+                $controller->addInlineJavascript('closePopupAndReloadParent();');
+            }
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Add a spouse to an existing family
-////////////////////////////////////////////////////////////////////////////////
-    case 'add_spouse_to_family':
-        $xref   = Filter::get('xref', WT_REGEX_XREF);
-        $famtag = Filter::get('famtag', 'HUSB|WIFE');
+    ////////////////////////////////////////////////////////////////////////////////
+    // Add a spouse to an existing family
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'add_spouse_to_family':
+            $xref   = Filter::get('xref', WT_REGEX_XREF);
+            $famtag = Filter::get('famtag', 'HUSB|WIFE');
 
-        $family = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $family = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-        if ($famtag === 'WIFE') {
-            $controller->setPageTitle(I18N::translate('Add a wife'));
-            $sex = 'F';
-        } else {
-            $controller->setPageTitle(I18N::translate('Add a husband'));
-            $sex = 'M';
-        }
-        $controller->pageHeader();
+            if ($famtag === 'WIFE') {
+                $controller->setPageTitle(I18N::translate('Add a wife'));
+                $sex = 'F';
+            } else {
+                $controller->setPageTitle(I18N::translate('Add a husband'));
+                $sex = 'M';
+            }
+            $controller->pageHeader();
 
-        print_indi_form('add_spouse_to_family_action', null, $family, null, $famtag, $sex);
-        break;
+            print_indi_form('add_spouse_to_family_action', null, $family, null, $famtag, $sex);
+            break;
 
-    case 'add_spouse_to_family_action':
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $glevels = Filter::postArray('glevels', '[0-9]');
-        $tag     = Filter::postArray('tag', WT_REGEX_TAG);
-        $text    = Filter::postArray('text');
-        $islink  = Filter::postArray('islink', '[01]');
+        case 'add_spouse_to_family_action':
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $glevels = Filter::postArray('glevels', '[0-9]');
+            $tag     = Filter::postArray('tag', WT_REGEX_TAG);
+            $text    = Filter::postArray('text');
+            $islink  = Filter::postArray('islink', '[01]');
 
-        $family  = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $family  = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-        if (!Filter::checkCsrf()) {
-            $famtag = Filter::get('famtag', 'HUSB|WIFE');
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_spouse_to_family&xref=' . $xref . '&famtag=' . $famtag);
+            if (!Filter::checkCsrf()) {
+                $famtag = Filter::get('famtag', 'HUSB|WIFE');
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=add_spouse_to_family&xref=' . $xref . '&famtag=' . $famtag);
 
-            return;
-        }
+                return;
+            }
 
-        $controller->pageHeader();
+            $controller->pageHeader();
 
-        // Create the new spouse
-        FunctionsEdit::splitSource(); // separate SOUR record from the rest
+            // Create the new spouse
+            FunctionsEdit::splitSource(); // separate SOUR record from the rest
 
-        $gedrec = '0 @REF@ INDI';
-        $gedrec .= FunctionsEdit::addNewName();
-        $gedrec .= FunctionsEdit::addNewSex();
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $gedrec .= FunctionsEdit::addNewFact($match);
+            $gedrec = '0 @REF@ INDI';
+            $gedrec .= FunctionsEdit::addNewName();
+            $gedrec .= FunctionsEdit::addNewSex();
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $gedrec .= FunctionsEdit::addNewFact($match);
+                }
             }
-        }
 
-        if (Filter::postBool('SOUR_INDI')) {
-            $gedrec = FunctionsEdit::handleUpdates($gedrec);
-        } else {
-            $gedrec = FunctionsEdit::updateRest($gedrec);
-        }
-        $gedrec .= "\n1 FAMS @" . $family->getXref() . '@';
-        $spouse = $family->getTree()->createRecord($gedrec);
+            if (Filter::postBool('SOUR_INDI')) {
+                $gedrec = FunctionsEdit::handleUpdates($gedrec);
+            } else {
+                $gedrec = FunctionsEdit::updateRest($gedrec);
+            }
+            $gedrec .= "\n1 FAMS @" . $family->getXref() . '@';
+            $spouse = $family->getTree()->createRecord($gedrec);
 
-        // Update the existing family - add marriage, etc
-        if ($family->getFirstFact('HUSB')) {
-            $family->createFact('1 WIFE @' . $spouse->getXref() . '@', true);
-        } else {
-            $family->createFact('1 HUSB @' . $spouse->getXref() . '@', true);
-        }
-        $famrec = '';
-        if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
-            foreach ($matches[1] as $match) {
-                $famrec .= FunctionsEdit::addNewFact($match);
+            // Update the existing family - add marriage, etc
+            if ($family->getFirstFact('HUSB')) {
+                $family->createFact('1 WIFE @' . $spouse->getXref() . '@', true);
+            } else {
+                $family->createFact('1 HUSB @' . $spouse->getXref() . '@', true);
             }
-        }
-        if (Filter::postBool('SOUR_FAM')) {
-            $famrec = FunctionsEdit::handleUpdates($famrec);
-        } else {
-            $famrec = FunctionsEdit::updateRest($famrec);
-        }
-        $family->createFact(trim($famrec), true); // trim leading \n
+            $famrec = '';
+            if (preg_match_all('/([A-Z0-9_]+)/', $WT_TREE->getPreference('QUICK_REQUIRED_FAMFACTS'), $matches)) {
+                foreach ($matches[1] as $match) {
+                    $famrec .= FunctionsEdit::addNewFact($match);
+                }
+            }
+            if (Filter::postBool('SOUR_FAM')) {
+                $famrec = FunctionsEdit::handleUpdates($famrec);
+            } else {
+                $famrec = FunctionsEdit::updateRest($famrec);
+            }
+            $family->createFact(trim($famrec), true); // trim leading \n
 
-        if (Filter::post('goto') === 'new') {
-            $controller->addInlineJavascript('closePopupAndReloadParent("' . $spouse->getRawUrl() . '");');
-        } else {
-            $controller->addInlineJavascript('closePopupAndReloadParent();');
-        }
-        break;
+            if (Filter::post('goto') === 'new') {
+                $controller->addInlineJavascript('closePopupAndReloadParent("' . $spouse->getRawUrl() . '");');
+            } else {
+                $controller->addInlineJavascript('closePopupAndReloadParent();');
+            }
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Link an individual to an existing family, as a child
-////////////////////////////////////////////////////////////////////////////////
-    case 'addfamlink':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+    // Link an individual to an existing family, as a child
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addfamlink':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Link this individual to an existing family as a child'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Link this individual to an existing family as a child'))
+            ->pageHeader();
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo $controller->getPageTitle(); ?></h2>
         <form method="post" name="addchildform" action="edit_interface.php">
@@ -987,7 +987,7 @@ 
                     </td>
                     <td class="facts_value">
                         <?php echo FunctionsEdit::editFieldPedigree('PEDI', '', '', $person); ?>
-                        <p class="small text-muted">
+                            <p class="small text-muted">
                             <?php echo I18N::translate('A child may have more than one set of parents. The relationship between the child and the parents can be biological, legal, or based on local culture and tradition. If no pedigree is specified, then a biological relationship will be assumed.'); ?>
                         </p>
                     </td>
@@ -1001,77 +1001,77 @@ 
         </form>
     </div>
         <?php
-        break;
+            break;
 
-    case 'linkfamaction':
-        $xref   = Filter::post('xref', WT_REGEX_XREF);
-        $famid  = Filter::post('famid', WT_REGEX_XREF);
-        $PEDI   = Filter::post('PEDI');
+        case 'linkfamaction':
+            $xref   = Filter::post('xref', WT_REGEX_XREF);
+            $famid  = Filter::post('famid', WT_REGEX_XREF);
+            $PEDI   = Filter::post('PEDI');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addfamlink&xref=' . $xref);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addfamlink&xref=' . $xref);
 
-            return;
-        }
+                return;
+            }
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        $family = Family::getInstance($famid, $WT_TREE);
-        check_record_access($person);
-        check_record_access($family);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            $family = Family::getInstance($famid, $WT_TREE);
+            check_record_access($person);
+            check_record_access($family);
 
-        $controller
-        ->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Link this individual to an existing family as a child'))
-        ->pageHeader();
-
-        // Replace any existing child->family link (we may be changing the PEDI);
-        $fact_id = null;
-        foreach ($person->getFacts('FAMC') as $fact) {
-            if ($family === $fact->getTarget()) {
-                $fact_id = $fact->getFactId();
-                break;
+            $controller
+            ->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Link this individual to an existing family as a child'))
+            ->pageHeader();
+
+            // Replace any existing child->family link (we may be changing the PEDI);
+            $fact_id = null;
+            foreach ($person->getFacts('FAMC') as $fact) {
+                if ($family === $fact->getTarget()) {
+                    $fact_id = $fact->getFactId();
+                    break;
+                }
             }
-        }
 
-        $gedcom = GedcomCodePedi::createNewFamcPedi($PEDI, $famid);
-        $person->updateFact($fact_id, $gedcom, true);
+            $gedcom = GedcomCodePedi::createNewFamcPedi($PEDI, $famid);
+            $person->updateFact($fact_id, $gedcom, true);
 
-        // Only set the family->child link if it does not already exist
-        $edit_fact = null;
-        foreach ($family->getFacts('CHIL') as $fact) {
-            if ($person === $fact->getTarget()) {
-                $edit_fact = $fact;
-                break;
+            // Only set the family->child link if it does not already exist
+            $edit_fact = null;
+            foreach ($family->getFacts('CHIL') as $fact) {
+                if ($person === $fact->getTarget()) {
+                    $edit_fact = $fact;
+                    break;
+                }
+            }
+            if (!$edit_fact) {
+                $family->createFact('1 CHIL @' . $person->getXref() . '@', true);
             }
-        }
-        if (!$edit_fact) {
-            $family->createFact('1 CHIL @' . $person->getXref() . '@', true);
-        }
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Link and individual to an existing individual as a spouse
-////////////////////////////////////////////////////////////////////////////////
-    case 'linkspouse':
-        $famtag = Filter::get('famtag', 'HUSB|WIFE');
-        $xref   = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+    // Link and individual to an existing individual as a spouse
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'linkspouse':
+            $famtag = Filter::get('famtag', 'HUSB|WIFE');
+            $xref   = Filter::get('xref', WT_REGEX_XREF);
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        if ($person->getSex() === 'F') {
-            $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
-            $label = I18N::translate('Husband');
-        } else {
-            $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
-            $label = I18N::translate('Wife');
-        }
+            if ($person->getSex() === 'F') {
+                $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
+                $label = I18N::translate('Husband');
+            } else {
+                $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
+                $label = I18N::translate('Wife');
+            }
 
-        $controller->pageHeader();
-        FunctionsPrint::initializeCalendarPopup();
+            $controller->pageHeader();
+            FunctionsPrint::initializeCalendarPopup();
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo $controller->getPageTitle(); ?></h2>
         <form method="post" name="addchildform" action="edit_interface.php">
@@ -1091,17 +1091,17 @@ 
                     </td>
                 </tr>
                 <?php FunctionsEdit::addSimpleTag('0 MARR Y'); ?>
-                <?php FunctionsEdit::addSimpleTag('0 DATE', 'MARR'); ?>
-                <?php FunctionsEdit::addSimpleTag('0 PLAC', 'MARR'); ?>
-                <?php echo keep_chan($person); ?>
-            </table>
+                    <?php FunctionsEdit::addSimpleTag('0 DATE', 'MARR'); ?>
+                    <?php FunctionsEdit::addSimpleTag('0 PLAC', 'MARR'); ?>
+                    <?php echo keep_chan($person); ?>
+                </table>
             <?php FunctionsEdit::printAddLayer('SOUR'); ?>
-            <?php FunctionsEdit::printAddLayer('OBJE'); ?>
-            <?php FunctionsEdit::printAddLayer('NOTE'); ?>
-            <?php FunctionsEdit::printAddLayer('SHARED_NOTE'); ?>
-            <?php FunctionsEdit::printAddLayer('ASSO'); ?>
-            <?php FunctionsEdit::printAddLayer('ASSO2'); ?>
-            <?php FunctionsEdit::printAddLayer('RESN'); ?>
+                <?php FunctionsEdit::printAddLayer('OBJE'); ?>
+                <?php FunctionsEdit::printAddLayer('NOTE'); ?>
+                <?php FunctionsEdit::printAddLayer('SHARED_NOTE'); ?>
+                <?php FunctionsEdit::printAddLayer('ASSO'); ?>
+                <?php FunctionsEdit::printAddLayer('ASSO2'); ?>
+                <?php FunctionsEdit::printAddLayer('RESN'); ?>
             <p id="save-cancel">
                 <input type="submit" class="save" value="<?php echo I18N::translate('save'); ?>">
                 <input type="button" class="cancel" value="<?php echo I18N::translate('close'); ?>" onclick="window.close();">
@@ -1109,74 +1109,74 @@ 
         </form>
     </div>
         <?php
-        break;
-
-    case 'linkspouseaction':
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $spid    = Filter::post('spid', WT_REGEX_XREF);
-        $famtag  = Filter::post('famtag', 'HUSB|WIFE');
-        $glevels = Filter::postArray('glevels', '[0-9]');
-        $tag     = Filter::postArray('tag', WT_REGEX_TAG);
-        $text    = Filter::postArray('text');
-        $islink  = Filter::postArray('islink', '[01]');
+            break;
 
-        if (!Filter::checkCsrf()) {
-            $famtag = Filter::get('famtag', 'HUSB|WIFE');
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=linkspouse&xref=' . $xref . '&famtag=' . $famtag);
+        case 'linkspouseaction':
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $spid    = Filter::post('spid', WT_REGEX_XREF);
+            $famtag  = Filter::post('famtag', 'HUSB|WIFE');
+            $glevels = Filter::postArray('glevels', '[0-9]');
+            $tag     = Filter::postArray('tag', WT_REGEX_TAG);
+            $text    = Filter::postArray('text');
+            $islink  = Filter::postArray('islink', '[01]');
 
-            return;
-        }
+            if (!Filter::checkCsrf()) {
+                $famtag = Filter::get('famtag', 'HUSB|WIFE');
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=linkspouse&xref=' . $xref . '&famtag=' . $famtag);
 
-        $person  = Individual::getInstance($xref, $WT_TREE);
-        $spouse  = Individual::getInstance($spid, $WT_TREE);
-        check_record_access($person);
-        check_record_access($spouse);
+                return;
+            }
 
-        if ($person->getSex() === 'F') {
-            $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
-        } else {
-            $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
-        }
-        $controller->pageHeader();
+            $person  = Individual::getInstance($xref, $WT_TREE);
+            $spouse  = Individual::getInstance($spid, $WT_TREE);
+            check_record_access($person);
+            check_record_access($spouse);
 
-        if ($person->getSex() === 'M') {
-            $gedcom = "0 @new@ FAM\n1 HUSB @" . $person->getXref() . "@\n1 WIFE @" . $spouse->getXref() . '@';
-        } else {
-            $gedcom = "0 @new@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@';
-        }
-        FunctionsEdit::splitSource();
-        $gedcom .= FunctionsEdit::addNewFact('MARR');
+            if ($person->getSex() === 'F') {
+                $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a husband using an existing individual'));
+            } else {
+                $controller->setPageTitle($person->getFullName() . ' - ' . I18N::translate('Add a wife using an existing individual'));
+            }
+            $controller->pageHeader();
 
-        if (Filter::postBool('SOUR_FAM') || count($tagSOUR) > 0) {
-            // before adding 2 SOUR it needs to add 1 MARR Y first
-            if (FunctionsEdit::addNewFact('MARR') === '') {
-                $gedcom .= "\n1 MARR Y";
+            if ($person->getSex() === 'M') {
+                $gedcom = "0 @new@ FAM\n1 HUSB @" . $person->getXref() . "@\n1 WIFE @" . $spouse->getXref() . '@';
+            } else {
+                $gedcom = "0 @new@ FAM\n1 HUSB @" . $spouse->getXref() . "@\n1 WIFE @" . $person->getXref() . '@';
             }
-            $gedcom = FunctionsEdit::handleUpdates($gedcom);
-        } else {
-            // before adding level 2 facts it needs to add 1 MARR Y first
-            if (FunctionsEdit::addNewFact('MARR') === '') {
-                $gedcom .= "\n1 MARR Y";
+            FunctionsEdit::splitSource();
+            $gedcom .= FunctionsEdit::addNewFact('MARR');
+
+            if (Filter::postBool('SOUR_FAM') || count($tagSOUR) > 0) {
+                // before adding 2 SOUR it needs to add 1 MARR Y first
+                if (FunctionsEdit::addNewFact('MARR') === '') {
+                    $gedcom .= "\n1 MARR Y";
+                }
+                $gedcom = FunctionsEdit::handleUpdates($gedcom);
+            } else {
+                // before adding level 2 facts it needs to add 1 MARR Y first
+                if (FunctionsEdit::addNewFact('MARR') === '') {
+                    $gedcom .= "\n1 MARR Y";
+                }
+                $gedcom = FunctionsEdit::updateRest($gedcom);
             }
-            $gedcom = FunctionsEdit::updateRest($gedcom);
-        }
 
-        $family = $person->getTree()->createRecord($gedcom);
-        $person->createFact('1 FAMS @' . $family->getXref() . '@', true);
-        $spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
+            $family = $person->getTree()->createRecord($gedcom);
+            $person->createFact('1 FAMS @' . $family->getXref() . '@', true);
+            $spouse->createFact('1 FAMS @' . $family->getXref() . '@', true);
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Create a new source record
-////////////////////////////////////////////////////////////////////////////////
-    case 'addnewsource':
-        $controller
-        ->setPageTitle(I18N::translate('Create a source'))
-        ->pageHeader();
+    ////////////////////////////////////////////////////////////////////////////////
+    // Create a new source record
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addnewsource':
+            $controller
+            ->setPageTitle(I18N::translate('Create a source'))
+            ->pageHeader();
 
-        ?>
+            ?>
     <script>
         function check_form(frm) {
             if (frm.TITL.value=="") {
@@ -1200,14 +1200,14 @@ 
                 <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ABBR'); ?></td>
                 <td class="optionbox wrap"><input type="text" name="ABBR" id="ABBR" value="" size="40" maxlength="255"> <?php echo FunctionsPrint::printSpecialCharacterLink('ABBR'); ?></td></tr>
                 <?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "_HEB") !== false) { ?>
-                <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'); ?></td>
+                    <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'); ?></td>
                 <td class="optionbox wrap"><input type="text" name="_HEB" id="_HEB" value="" size="60"> <?php echo FunctionsPrint::printSpecialCharacterLink('_HEB'); ?></td></tr>
                 <?php } ?>
-                <?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "ROMN") !== false) { ?>
-                <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'); ?></td>
+                    <?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "ROMN") !== false) { ?>
+                    <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'); ?></td>
                 <td class="optionbox wrap"><input  type="text" name="ROMN" id="ROMN" value="" size="60"> <?php echo FunctionsPrint::printSpecialCharacterLink('ROMN'); ?></td></tr>
                 <?php } ?>
-                <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('AUTH'); ?></td>
+                    <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('AUTH'); ?></td>
                 <td class="optionbox wrap"><input type="text" name="AUTH" id="AUTH" value="" size="40" maxlength="255"> <?php echo FunctionsPrint::printSpecialCharacterLink('AUTH'); ?></td></tr>
                 <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('PUBL'); ?></td>
                 <td class="optionbox wrap"><textarea name="PUBL" id="PUBL" rows="5" cols="60"></textarea><br><?php echo FunctionsPrint::printSpecialCharacterLink('PUBL'); ?></td></tr>
@@ -1225,24 +1225,24 @@ 
                     <td class="descriptionbox wrap width25"><?php echo I18N::translate('Select events'), FunctionsPrint::helpLink('edit_SOUR_EVEN'); ?></td>
                     <td class="optionbox wrap"><select name="EVEN[]" multiple="multiple" size="5">
                         <?php
-                        $parts = explode(',', $WT_TREE->getPreference('INDI_FACTS_ADD'));
-                        foreach ($parts as $key) {
-                            ?><option value="<?php echo $key; ?>"><?php echo GedcomTag::getLabel($key); ?></option>
+                            $parts = explode(',', $WT_TREE->getPreference('INDI_FACTS_ADD'));
+                            foreach ($parts as $key) {
+                                ?><option value="<?php echo $key; ?>"><?php echo GedcomTag::getLabel($key); ?></option>
                             <?php
-                        }
-                        $parts = explode(',', $WT_TREE->getPreference('FAM_FACTS_ADD'));
-                        foreach ($parts as $key) {
-                            ?><option value="<?php echo $key; ?>"><?php echo GedcomTag::getLabel($key); ?></option>
+                            }
+                            $parts = explode(',', $WT_TREE->getPreference('FAM_FACTS_ADD'));
+                            foreach ($parts as $key) {
+                                ?><option value="<?php echo $key; ?>"><?php echo GedcomTag::getLabel($key); ?></option>
                             <?php
-                        }
-                        ?>
+                            }
+                            ?>
                     </select></td>
                 </tr>
                     <?php
-                    FunctionsEdit::addSimpleTag('0 DATE', 'EVEN');
-                    FunctionsEdit::addSimpleTag('0 PLAC', 'EVEN');
-                    FunctionsEdit::addSimpleTag('0 AGNC');
-                    ?>
+                        FunctionsEdit::addSimpleTag('0 DATE', 'EVEN');
+                        FunctionsEdit::addSimpleTag('0 PLAC', 'EVEN');
+                        FunctionsEdit::addSimpleTag('0 AGNC');
+                        ?>
                 </table>
             </div>
             <p id="save-cancel">
@@ -1252,83 +1252,83 @@ 
         </form>
     </div>
         <?php
-        break;
+            break;
 
-    case 'addsourceaction':
-        $controller
-        ->setPageTitle(I18N::translate('Create a source'))
-        ->pageHeader();
+        case 'addsourceaction':
+            $controller
+            ->setPageTitle(I18N::translate('Create a source'))
+            ->pageHeader();
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addnewsource');
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addnewsource');
 
-            return;
-        }
+                return;
+            }
 
-        $newgedrec = '0 @XREF@ SOUR';
-        $ABBR      = Filter::post('ABBR');
-        if ($ABBR) {
-            $newgedrec .= "\n1 ABBR " . $ABBR;
-        }
-        $TITL = Filter::post('TITL');
-        if ($TITL) {
-            $newgedrec .= "\n1 TITL " . $TITL;
-            $_HEB = Filter::post('_HEB');
-            if ($_HEB) {
-                $newgedrec .= "\n2 _HEB " . $_HEB;
+            $newgedrec = '0 @XREF@ SOUR';
+            $ABBR      = Filter::post('ABBR');
+            if ($ABBR) {
+                $newgedrec .= "\n1 ABBR " . $ABBR;
             }
-            $ROMN = Filter::post('ROMN');
-            if ($ROMN) {
-                $newgedrec .= "\n2 ROMN " . $ROMN;
+            $TITL = Filter::post('TITL');
+            if ($TITL) {
+                $newgedrec .= "\n1 TITL " . $TITL;
+                $_HEB = Filter::post('_HEB');
+                if ($_HEB) {
+                    $newgedrec .= "\n2 _HEB " . $_HEB;
+                }
+                $ROMN = Filter::post('ROMN');
+                if ($ROMN) {
+                    $newgedrec .= "\n2 ROMN " . $ROMN;
+                }
             }
-        }
-        $AUTH = Filter::post('AUTH');
-        if ($AUTH) {
-            $newgedrec .= "\n1 AUTH " . $AUTH;
-        }
-        $PUBL = Filter::post('PUBL');
-        if ($PUBL) {
-            $newgedrec .= "\n1 PUBL " . preg_replace('/\r?\n/', "\n2 CONT ", $PUBL);
-        }
-        $REPO = Filter::post('REPO', WT_REGEX_XREF);
-        if ($REPO) {
-            $newgedrec .= "\n1 REPO @" . $REPO . '@';
-            $CALN = Filter::post('CALN');
-            if ($CALN) {
-                $newgedrec .= "\n2 CALN " . $CALN;
+            $AUTH = Filter::post('AUTH');
+            if ($AUTH) {
+                $newgedrec .= "\n1 AUTH " . $AUTH;
             }
-        }
-        $EVEN = Filter::postArray('EVEN', WT_REGEX_TAG);
-        if ($EVEN) {
-            $newgedrec .= "\n1 DATA";
-            $newgedrec .= "\n2 EVEN " . implode(',', $EVEN);
-            $EVEN_DATE = Filter::post('EVEN_DATE');
-            if ($EVEN_DATE) {
-                $newgedrec .= "\n3 EVEN_DATE " . $EVEN_DATE;
-            }
-            $EVEN_PLAC = Filter::post('EVEN_PLAC');
-            if ($EVEN_PLAC) {
-                $newgedrec .= "\n3 EVEN_PLAC " . $EVEN_PLAC;
-            }
-            $AGNC = Filter::post('AGNC');
-            if ($AGNC) {
-                $newgedrec .= "\n2 AGNC " . $AGNC;
+            $PUBL = Filter::post('PUBL');
+            if ($PUBL) {
+                $newgedrec .= "\n1 PUBL " . preg_replace('/\r?\n/', "\n2 CONT ", $PUBL);
+            }
+            $REPO = Filter::post('REPO', WT_REGEX_XREF);
+            if ($REPO) {
+                $newgedrec .= "\n1 REPO @" . $REPO . '@';
+                $CALN = Filter::post('CALN');
+                if ($CALN) {
+                    $newgedrec .= "\n2 CALN " . $CALN;
+                }
+            }
+            $EVEN = Filter::postArray('EVEN', WT_REGEX_TAG);
+            if ($EVEN) {
+                $newgedrec .= "\n1 DATA";
+                $newgedrec .= "\n2 EVEN " . implode(',', $EVEN);
+                $EVEN_DATE = Filter::post('EVEN_DATE');
+                if ($EVEN_DATE) {
+                    $newgedrec .= "\n3 EVEN_DATE " . $EVEN_DATE;
+                }
+                $EVEN_PLAC = Filter::post('EVEN_PLAC');
+                if ($EVEN_PLAC) {
+                    $newgedrec .= "\n3 EVEN_PLAC " . $EVEN_PLAC;
+                }
+                $AGNC = Filter::post('AGNC');
+                if ($AGNC) {
+                    $newgedrec .= "\n2 AGNC " . $AGNC;
+                }
             }
-        }
 
-        $record = $WT_TREE->createRecord($newgedrec);
-        $controller->addInlineJavascript('openerpasteid("' . $record->getXref() . '");');
-        break;
+            $record = $WT_TREE->createRecord($newgedrec);
+            $controller->addInlineJavascript('openerpasteid("' . $record->getXref() . '");');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Create a new note record
-////////////////////////////////////////////////////////////////////////////////
-    case 'addnewnote':
-        $controller
-        ->setPageTitle(I18N::translate('Create a shared note'))
-        ->pageHeader();
+    ////////////////////////////////////////////////////////////////////////////////
+    // Create a new note record
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addnewnote':
+            $controller
+            ->setPageTitle(I18N::translate('Create a shared note'))
+            ->pageHeader();
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo $controller->getPageTitle(); ?></h2>
 
@@ -1337,19 +1337,19 @@ 
             <input type="hidden" name="action" value="addnoteaction">
             <input type="hidden" name="noteid" value="newnote">
             <?php echo Filter::getCsrf(); ?>
-            <?php
-            echo '<table class="facts_table">';
-            echo '<tr>';
-            echo '<td class="descriptionbox nowrap">';
-            echo I18N::translate('Shared note');
-            echo '</td>';
-            echo '<td class="optionbox wrap"><textarea name="NOTE" id="NOTE" rows="15" cols="87"></textarea>';
-            echo FunctionsPrint::printSpecialCharacterLink('NOTE');
-            echo '</td>';
-            echo '</tr>';
-            echo keep_chan();
-            echo '</table>';
-            ?>
+                <?php
+                echo '<table class="facts_table">';
+                echo '<tr>';
+                echo '<td class="descriptionbox nowrap">';
+                echo I18N::translate('Shared note');
+                echo '</td>';
+                echo '<td class="optionbox wrap"><textarea name="NOTE" id="NOTE" rows="15" cols="87"></textarea>';
+                echo FunctionsPrint::printSpecialCharacterLink('NOTE');
+                echo '</td>';
+                echo '</tr>';
+                echo keep_chan();
+                echo '</table>';
+                ?>
             <p id="save-cancel">
                 <input type="submit" class="save" value="<?php echo I18N::translate('save'); ?>">
                 <input type="button" class="cancel" value="<?php echo I18N::translate('close'); ?>" onclick="window.close();">
@@ -1357,47 +1357,47 @@ 
         </form>
     </div>
         <?php
-        break;
+            break;
 
-    case 'addnoteaction':
-        $controller
-        ->setPageTitle(I18N::translate('Create a shared note'))
-        ->pageHeader();
+        case 'addnoteaction':
+            $controller
+            ->setPageTitle(I18N::translate('Create a shared note'))
+            ->pageHeader();
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addnewnote');
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addnewnote');
 
-            return;
-        }
+                return;
+            }
 
-        $gedrec = '0 @XREF@ NOTE ' . preg_replace("/\r?\n/", "\n1 CONT ", Filter::post('NOTE'));
+            $gedrec = '0 @XREF@ NOTE ' . preg_replace("/\r?\n/", "\n1 CONT ", Filter::post('NOTE'));
 
-        $record = $WT_TREE->createRecord($gedrec);
-        $controller->addInlineJavascript('openerpasteid("' . $record->getXref() . '");');
-        break;
+            $record = $WT_TREE->createRecord($gedrec);
+            $controller->addInlineJavascript('openerpasteid("' . $record->getXref() . '");');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'addnewnote_assisted':
-        require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/census/census-edit.php';
-        break;
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addnewnote_assisted':
+            require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/census/census-edit.php';
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'addnoteaction_assisted':
-        require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/census/census-save.php';
-        break;
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addnoteaction_assisted':
+            require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/census/census-save.php';
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'addmedia_links':
-        $pid = Filter::get('pid', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addmedia_links':
+            $pid = Filter::get('pid', WT_REGEX_XREF);
 
-        $person = Individual::getInstance($pid, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($pid, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->setPageTitle(I18N::translate('Family navigator') . ' — ' . $person->getFullName())
-        ->pageHeader();
+            $controller
+            ->setPageTitle(I18N::translate('Family navigator') . ' — ' . $person->getFullName())
+            ->pageHeader();
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo $controller->getPageTitle(); ?></h2>
         <form method="post" action="edit_interface.php?xref=<?php echo $person->getXref(); ?>" onsubmit="findindi()">
@@ -1405,26 +1405,26 @@ 
             <input type="hidden" name="action" value="addmedia_links">
             <input type="hidden" name="noteid" value="newnote">
             <?php echo Filter::getCsrf(); ?>
-            <?php require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/MEDIA_ctrl.php'; ?>
+                <?php require WT_ROOT . WT_MODULES_DIR . 'GEDFact_assistant/MEDIA_ctrl.php'; ?>
         </form>
     </div>
         <?php
-        break;
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Edit a note record
-////////////////////////////////////////////////////////////////////////////////
-    case 'editnote':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+    // Edit a note record
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'editnote':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
 
-        $note = Note::getInstance($xref, $WT_TREE);
-        check_record_access($note);
+            $note = Note::getInstance($xref, $WT_TREE);
+            check_record_access($note);
 
-        $controller
-        ->setPageTitle(I18N::translate('Edit the shared note'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle(I18N::translate('Edit the shared note'))
+            ->pageHeader();
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo $controller->getPageTitle(); ?></h2>
         <form method="post" action="edit_interface.php">
@@ -1450,53 +1450,53 @@ 
         </form>
     </div>
         <?php
-        break;
+            break;
 
-    case 'editnoteaction':
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $keep_chan = Filter::postBool('keep_chan');
-        $note      = Filter::post('NOTE');
+        case 'editnoteaction':
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $keep_chan = Filter::postBool('keep_chan');
+            $note      = Filter::post('NOTE');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=editnote&xref=' . $xref);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=editnote&xref=' . $xref);
 
-            return;
-        }
+                return;
+            }
 
-        $record = Note::getInstance($xref, $WT_TREE);
-        check_record_access($record);
+            $record = Note::getInstance($xref, $WT_TREE);
+            check_record_access($record);
 
-        $controller
-        ->setPageTitle(I18N::translate('Edit the shared note'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle(I18N::translate('Edit the shared note'))
+            ->pageHeader();
 
-        // We have user-supplied data in a replacement string - escape it against backreferences
-        $note = str_replace(array('\\', '$'), array('\\\\', '\\$'), $note);
+            // We have user-supplied data in a replacement string - escape it against backreferences
+            $note = str_replace(array('\\', '$'), array('\\\\', '\\$'), $note);
 
-        $gedrec = preg_replace(
-        '/^0 @' . $record->getXref() . '@ NOTE.*(\n1 CONT.*)*/',
-        '0 @' . $record->getXref() . '@ NOTE ' . preg_replace("/\r?\n/", "\n1 CONT ", $note),
-        $record->getGedcom()
-        );
+            $gedrec = preg_replace(
+            '/^0 @' . $record->getXref() . '@ NOTE.*(\n1 CONT.*)*/',
+            '0 @' . $record->getXref() . '@ NOTE ' . preg_replace("/\r?\n/", "\n1 CONT ", $note),
+            $record->getGedcom()
+            );
 
-        $record->updateRecord($gedrec, !$keep_chan);
+            $record->updateRecord($gedrec, !$keep_chan);
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Create a new repository
-////////////////////////////////////////////////////////////////////////////////
-    case 'addnewrepository':
-        $controller
-        ->setPageTitle(I18N::translate('Create a repository'))
-        ->pageHeader();
+    ////////////////////////////////////////////////////////////////////////////////
+    // Create a new repository
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addnewrepository':
+            $controller
+            ->setPageTitle(I18N::translate('Create a repository'))
+            ->pageHeader();
 
-        echo '<div id="edit_interface-page">';
-        echo '<h2>', $controller->getPageTitle(), '</h2>';
+            echo '<div id="edit_interface-page">';
+            echo '<h2>', $controller->getPageTitle(), '</h2>';
 
-        echo '<script>';
-        ?>
+            echo '<script>';
+            ?>
         function check_form(frm) {
             if (frm.NAME.value=="") {
                 alert('<?php echo I18N::translate('You must provide a repository name.'); ?>');
@@ -1506,8 +1506,8 @@ 
             return true;
         }
         <?php
-        echo '</script>';
-        ?>
+            echo '</script>';
+            ?>
     <form method="post" action="edit_interface.php" onsubmit="return check_form(this);">
         <input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
         <input type="hidden" name="action" value="addrepoaction">
@@ -1517,14 +1517,14 @@ 
             <tr><td class="descriptionbox wrap width25"><?php echo I18N::translate('Repository name'); ?></td>
             <td class="optionbox wrap"><input type="text" name="REPO_NAME" id="REPO_NAME" value="" size="40" maxlength="255"> <?php echo FunctionsPrint::printSpecialCharacterLink('REPO_NAME'); ?></td></tr>
             <?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "_HEB") !== false) { ?>
-            <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'); ?></td>
+                <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'); ?></td>
             <td class="optionbox wrap"><input type="text" name="_HEB" id="_HEB" value="" size="40" maxlength="255"> <?php echo FunctionsPrint::printSpecialCharacterLink('_HEB'); ?></td></tr>
             <?php } ?>
-            <?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "ROMN") !== false) { ?>
-            <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'); ?></td>
+                <?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "ROMN") !== false) { ?>
+                <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'); ?></td>
             <td class="optionbox wrap"><input type="text" name="ROMN" id="ROMN" value="" size="40" maxlength="255"> <?php echo FunctionsPrint::printSpecialCharacterLink('ROMN'); ?></td></tr>
             <?php } ?>
-            <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ADDR'); ?></td>
+                <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ADDR'); ?></td>
             <td class="optionbox wrap"><textarea name="ADDR" id="ADDR" rows="5" cols="60"></textarea><?php echo FunctionsPrint::printSpecialCharacterLink('ADDR'); ?> </td></tr>
             <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('PHON'); ?></td>
             <td class="optionbox wrap"><input type="text" name="PHON" id="PHON" value="" size="40" maxlength="255"> </td></tr>
@@ -1541,115 +1541,115 @@ 
     </form>
     </div>
         <?php
-        break;
-
-    case 'addrepoaction':
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addnewrepository');
+            break;
 
-            return;
-        }
+        case 'addrepoaction':
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=addnewrepository');
 
-        $controller
-        ->setPageTitle(I18N::translate('Create a repository'))
-        ->pageHeader();
+                return;
+            }
 
-        $gedrec    = '0 @XREF@ REPO';
-        $REPO_NAME = Filter::post('REPO_NAME');
-        if ($REPO_NAME) {
-            $gedrec .= "\n1 NAME " . $REPO_NAME;
-            $_HEB = Filter::post('_HEB');
-            if ($_HEB) {
-                $gedrec .= "\n2 _HEB " . $_HEB;
+            $controller
+            ->setPageTitle(I18N::translate('Create a repository'))
+            ->pageHeader();
+
+            $gedrec    = '0 @XREF@ REPO';
+            $REPO_NAME = Filter::post('REPO_NAME');
+            if ($REPO_NAME) {
+                $gedrec .= "\n1 NAME " . $REPO_NAME;
+                $_HEB = Filter::post('_HEB');
+                if ($_HEB) {
+                    $gedrec .= "\n2 _HEB " . $_HEB;
+                }
+                $ROMN = Filter::post('ROMN');
+                if ($ROMN) {
+                    $gedrec .= "\n2 ROMN " . $ROMN;
+                }
             }
-            $ROMN = Filter::post('ROMN');
-            if ($ROMN) {
-                $gedrec .= "\n2 ROMN " . $ROMN;
+            $ADDR = Filter::post('ADDR');
+            if ($ADDR) {
+                $gedrec .= "\n1 ADDR " . preg_replace('/\r?\n/', "\n2 CONT ", $ADDR);
+            }
+            $PHON = Filter::post('PHON');
+            if ($PHON) {
+                $gedrec .= "\n1 PHON " . $PHON;
+            }
+            $FAX = Filter::post('FAX');
+            if ($FAX) {
+                $gedrec .= "\n1 FAX " . $FAX;
+            }
+            $EMAIL = Filter::post('EMAIL');
+            if ($EMAIL) {
+                $gedrec .= "\n1 EMAIL " . $EMAIL;
+            }
+            $WWW = Filter::post('WWW');
+            if ($WWW) {
+                $gedrec .= "\n1 WWW " . $WWW;
             }
-        }
-        $ADDR = Filter::post('ADDR');
-        if ($ADDR) {
-            $gedrec .= "\n1 ADDR " . preg_replace('/\r?\n/', "\n2 CONT ", $ADDR);
-        }
-        $PHON = Filter::post('PHON');
-        if ($PHON) {
-            $gedrec .= "\n1 PHON " . $PHON;
-        }
-        $FAX = Filter::post('FAX');
-        if ($FAX) {
-            $gedrec .= "\n1 FAX " . $FAX;
-        }
-        $EMAIL = Filter::post('EMAIL');
-        if ($EMAIL) {
-            $gedrec .= "\n1 EMAIL " . $EMAIL;
-        }
-        $WWW = Filter::post('WWW');
-        if ($WWW) {
-            $gedrec .= "\n1 WWW " . $WWW;
-        }
 
-        $record = $WT_TREE->createRecord($gedrec);
-        $controller->addInlineJavascript('openerpasteid("' . $record->getXref() . '");');
-        break;
+            $record = $WT_TREE->createRecord($gedrec);
+            $controller->addInlineJavascript('openerpasteid("' . $record->getXref() . '");');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'editname':
-        $xref    = Filter::get('xref', WT_REGEX_XREF);
-        $fact_id = Filter::get('fact_id');
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'editname':
+            $xref    = Filter::get('xref', WT_REGEX_XREF);
+            $fact_id = Filter::get('fact_id');
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        // Find the fact to edit
-        $name_fact = null;
-        foreach ($person->getFacts() as $fact) {
-            if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
-                $name_fact = $fact;
+            // Find the fact to edit
+            $name_fact = null;
+            foreach ($person->getFacts() as $fact) {
+                if ($fact->getFactId() === $fact_id && $fact->canEdit()) {
+                    $name_fact = $fact;
+                }
             }
-        }
-        if (!$name_fact) {
-            $controller
-            ->pageHeader()
-            ->addInlineJavascript('closePopupAndReloadParent();');
+            if (!$name_fact) {
+                $controller
+                ->pageHeader()
+                ->addInlineJavascript('closePopupAndReloadParent();');
 
-            return;
-        }
+                return;
+            }
 
-        $controller
-        ->setPageTitle(I18N::translate('Edit the name'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle(I18N::translate('Edit the name'))
+            ->pageHeader();
 
-        print_indi_form('update', $person, null, $name_fact, '', $person->getSex());
+            print_indi_form('update', $person, null, $name_fact, '', $person->getSex());
 
-        break;
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-    case 'addname':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'addname':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->setPageTitle(I18N::translate('Add a name'))
-        ->pageHeader();
+            $controller
+            ->setPageTitle(I18N::translate('Add a name'))
+            ->pageHeader();
 
-        print_indi_form('update', $person, null, null, '', $person->getSex());
-        break;
+            print_indi_form('update', $person, null, null, '', $person->getSex());
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Change the order of media objects
-////////////////////////////////////////////////////////////////////////////////
-    case 'reorder_media':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+    // Change the order of media objects
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'reorder_media':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->setPageTitle(I18N::translate('Re-order media'))
-        ->pageHeader()
-        ->addInlineJavascript('
+            $controller
+            ->setPageTitle(I18N::translate('Re-order media'))
+            ->pageHeader()
+            ->addInlineJavascript('
 			jQuery("#reorder_media_list").sortable({forceHelperSize: true, forcePlaceholderSize: true, opacity: 0.7, cursor: "move", axis: "y"});
 
 			//-- update the order numbers after drag-n-drop sorting is complete
@@ -1662,37 +1662,37 @@ 
 				});
 		');
 
-        // Get the current sort order
-        $sort_obje = array();
-        foreach ($person->getFacts('_WT_OBJE_SORT') as $fact) {
-            $media = $fact->getTarget();
-            if ($media && $media->canShow()) {
-                $sort_obje[] = $media;
+            // Get the current sort order
+            $sort_obje = array();
+            foreach ($person->getFacts('_WT_OBJE_SORT') as $fact) {
+                $media = $fact->getTarget();
+                if ($media && $media->canShow()) {
+                    $sort_obje[] = $media;
+                }
             }
-        }
 
-        // Add other media objects from the individual and any spouse-families
-        $record_list = array($person);
-        foreach ($person->getSpouseFamilies() as $family) {
-            $record_list[] = $family;
-        }
-        foreach ($record_list as $record) {
-            if ($record->canShow()) {
-                foreach ($record->getFacts() as $fact) {
-                    if (!$fact->isPendingDeletion()) {
-                        preg_match_all('/(?:^1|\n\d) OBJE @(' . WT_REGEX_XREF . ')@/', $fact->getGedcom(), $matches);
-                        foreach ($matches[1] as $match) {
-                            $media = Media::getInstance($match, $WT_TREE);
-                            if (!in_array($media, $sort_obje)) {
-                                $sort_obje[] = $media;
+            // Add other media objects from the individual and any spouse-families
+            $record_list = array($person);
+            foreach ($person->getSpouseFamilies() as $family) {
+                $record_list[] = $family;
+            }
+            foreach ($record_list as $record) {
+                if ($record->canShow()) {
+                    foreach ($record->getFacts() as $fact) {
+                        if (!$fact->isPendingDeletion()) {
+                            preg_match_all('/(?:^1|\n\d) OBJE @(' . WT_REGEX_XREF . ')@/', $fact->getGedcom(), $matches);
+                            foreach ($matches[1] as $match) {
+                                $media = Media::getInstance($match, $WT_TREE);
+                                if (!in_array($media, $sort_obje)) {
+                                    $sort_obje[] = $media;
+                                }
                             }
                         }
                     }
                 }
             }
-        }
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo I18N::translate('Re-order media'); ?></h2>
         <form name="reorder_form" method="post" action="edit_interface.php">
@@ -1700,9 +1700,9 @@ 
             <input type="hidden" name="action" value="reorder_media_update">
             <input type="hidden" name="xref" value="<?php echo $xref; ?>">
             <?php echo Filter::getCsrf(); ?>
-            <ul id="reorder_media_list">
+                <ul id="reorder_media_list">
             <?php foreach ($sort_obje as $n => $obje) { ?>
-                <li class="facts_value" style="list-style:none;cursor:move;margin-bottom:2px;" id="li_<?php echo $obje->getXref(); ?>">
+                    <li class="facts_value" style="list-style:none;cursor:move;margin-bottom:2px;" id="li_<?php echo $obje->getXref(); ?>">
                     <table class="pic">
                         <tr>
                             <td>
@@ -1724,61 +1724,61 @@ 
         </form>
     </div>
         <?php
-        break;
-
-    case 'reorder_media_update':
-        $xref   = Filter::post('xref', WT_REGEX_XREF);
-        $order1 = Filter::post('order1');
+            break;
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=reorder_media_&xref=' . $xref);
+        case 'reorder_media_update':
+            $xref   = Filter::post('xref', WT_REGEX_XREF);
+            $order1 = Filter::post('order1');
 
-            return;
-        }
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=reorder_media_&xref=' . $xref);
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+                return;
+            }
 
-        $controller
-        ->setPageTitle(I18N::translate('Re-order media'))
-        ->pageHeader();
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        // Delete any existing _WT_OBJE_SORT records
-        $facts = array('0 @' . $person->getXref() . '@ INDI');
-        foreach ($person->getFacts() as $fact) {
-            if ($fact->getTag() !== '_WT_OBJE_SORT') {
-                $facts[] = $fact->getGedcom();
+            $controller
+            ->setPageTitle(I18N::translate('Re-order media'))
+            ->pageHeader();
+
+            // Delete any existing _WT_OBJE_SORT records
+            $facts = array('0 @' . $person->getXref() . '@ INDI');
+            foreach ($person->getFacts() as $fact) {
+                if ($fact->getTag() !== '_WT_OBJE_SORT') {
+                    $facts[] = $fact->getGedcom();
+                }
             }
-        }
-        if (is_array($order1)) {
-            // Add new _WT_OBJE_SORT records
-            foreach ($order1 as $xref => $n) {
-                $facts[] = '1 _WT_OBJE_SORT @' . $xref . '@';
+            if (is_array($order1)) {
+                // Add new _WT_OBJE_SORT records
+                foreach ($order1 as $xref => $n) {
+                    $facts[] = '1 _WT_OBJE_SORT @' . $xref . '@';
+                }
             }
-        }
 
-        $person->updateRecord(implode("\n", $facts), false);
+            $person->updateRecord(implode("\n", $facts), false);
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Change the order of children within a family record
-////////////////////////////////////////////////////////////////////////////////
-    case 'reorder_children':
-        $xref   = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF));
-        $option = Filter::post('option');
+    ////////////////////////////////////////////////////////////////////////////////
+    // Change the order of children within a family record
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'reorder_children':
+            $xref   = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF));
+            $option = Filter::post('option');
 
-        $family = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $family = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-        $controller
-        ->addInlineJavascript('jQuery("#reorder_list").sortable({forceHelperSize: true, forcePlaceholderSize: true, opacity: 0.7, cursor: "move", axis: "y"});')
-        ->addInlineJavascript('jQuery("#reorder_list").bind("sortupdate", function(event, ui) { jQuery("#"+jQuery(this).attr("id")+" input").each( function (index, value) { value.value = index+1; }); });')
-        ->setPageTitle(I18N::translate('Re-order children'))
-        ->pageHeader();
+            $controller
+            ->addInlineJavascript('jQuery("#reorder_list").sortable({forceHelperSize: true, forcePlaceholderSize: true, opacity: 0.7, cursor: "move", axis: "y"});')
+            ->addInlineJavascript('jQuery("#reorder_list").bind("sortupdate", function(event, ui) { jQuery("#"+jQuery(this).attr("id")+" input").each( function (index, value) { value.value = index+1; }); });')
+            ->setPageTitle(I18N::translate('Re-order children'))
+            ->pageHeader();
 
-        ?>
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo $controller->getPageTitle(); ?></h2>
         <form name="reorder_form" method="post" action="edit_interface.php">
@@ -1787,39 +1787,39 @@ 
             <input type="hidden" name="xref" value="<?php echo $xref; ?>">
             <input type="hidden" name="option" value="bybirth">
             <?php echo Filter::getCsrf(); ?>
-            <ul id="reorder_list">
+                <ul id="reorder_list">
                 <?php
-                // reorder children in modified families
-                $ids = array();
-                foreach ($family->getChildren() as $child) {
-                    $ids[] = $child->getXref();
-                }
-                $children = array();
-                foreach ($family->getChildren() as $k => $child) {
-                    $bdate = $child->getEstimatedBirthDate();
-                    if ($bdate->isOK()) {
-                        $sortkey = $bdate->julianDay();
-                    } else {
-                        $sortkey = 1e8; // birth date missing => sort last
+                    // reorder children in modified families
+                    $ids = array();
+                    foreach ($family->getChildren() as $child) {
+                        $ids[] = $child->getXref();
                     }
-                    $children[$child->getXref()] = $sortkey;
-                }
-                if ($option === 'bybirth') {
-                    asort($children);
-                }
-                $i = 0;
-                foreach ($children as $id => $child) {
-                    echo '<li style="cursor:move; margin-bottom:2px; position:relative;"';
-                    if (!in_array($id, $ids)) {
-                        echo ' class="facts_value new"';
+                    $children = array();
+                    foreach ($family->getChildren() as $k => $child) {
+                        $bdate = $child->getEstimatedBirthDate();
+                        if ($bdate->isOK()) {
+                            $sortkey = $bdate->julianDay();
+                        } else {
+                            $sortkey = 1e8; // birth date missing => sort last
+                        }
+                        $children[$child->getXref()] = $sortkey;
                     }
-                    echo ' id="li_', $id, '">';
-                    echo Theme::theme()->individualBoxLarge(Individual::getInstance($id, $WT_TREE));
-                    echo '<input type="hidden" name="order[', $id, ']" value="', $i, '">';
-                    echo '</li>';
-                    $i++;
-                }
-                ?>
+                    if ($option === 'bybirth') {
+                        asort($children);
+                    }
+                    $i = 0;
+                    foreach ($children as $id => $child) {
+                        echo '<li style="cursor:move; margin-bottom:2px; position:relative;"';
+                        if (!in_array($id, $ids)) {
+                            echo ' class="facts_value new"';
+                        }
+                        echo ' id="li_', $id, '">';
+                        echo Theme::theme()->individualBoxLarge(Individual::getInstance($id, $WT_TREE));
+                        echo '<input type="hidden" name="order[', $id, ']" value="', $i, '">';
+                        echo '</li>';
+                        $i++;
+                    }
+                    ?>
             </ul>
             <p id="save-cancel">
                 <input type="submit" class="save" value="<?php echo I18N::translate('save'); ?>">
@@ -1829,66 +1829,66 @@ 
         </form>
     </div>
         <?php
-        break;
+            break;
 
-    case 'reorder_update':
-        $xref  = Filter::post('xref', WT_REGEX_XREF);
-        $order = Filter::post('order');
+        case 'reorder_update':
+            $xref  = Filter::post('xref', WT_REGEX_XREF);
+            $order = Filter::post('order');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=reorder_children&xref=' . $xref);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=reorder_children&xref=' . $xref);
 
-            return;
-        }
+                return;
+            }
 
-        $family = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $family = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-        $controller
-        ->setPageTitle(I18N::translate('Re-order children'))
-        ->pageHeader();
-
-        if (is_array($order)) {
-            $gedcom = array('0 @' . $family->getXref() . '@ FAM');
-            $facts  = $family->getFacts();
-
-            // Move children to the end of the record
-            foreach ($order as $child => $num) {
-                foreach ($facts as $n => $fact) {
-                    if ($fact->getValue() === '@' . $child . '@') {
-                        $facts[] = $fact;
-                        unset($facts[$n]);
-                        break;
+            $controller
+            ->setPageTitle(I18N::translate('Re-order children'))
+            ->pageHeader();
+
+            if (is_array($order)) {
+                $gedcom = array('0 @' . $family->getXref() . '@ FAM');
+                $facts  = $family->getFacts();
+
+                // Move children to the end of the record
+                foreach ($order as $child => $num) {
+                    foreach ($facts as $n => $fact) {
+                        if ($fact->getValue() === '@' . $child . '@') {
+                            $facts[] = $fact;
+                            unset($facts[$n]);
+                            break;
+                        }
                     }
                 }
-            }
-            foreach ($facts as $fact) {
-                $gedcom[] = $fact->getGedcom();
-            }
+                foreach ($facts as $fact) {
+                    $gedcom[] = $fact->getGedcom();
+                }
 
-            $family->updateRecord(implode("\n", $gedcom), false);
-        }
+                $family->updateRecord(implode("\n", $gedcom), false);
+            }
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Change the members of a family record
-////////////////////////////////////////////////////////////////////////////////
-    case 'changefamily':
-        $xref = Filter::get('xref', WT_REGEX_XREF);
+    ////////////////////////////////////////////////////////////////////////////////
+    // Change the members of a family record
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'changefamily':
+            $xref = Filter::get('xref', WT_REGEX_XREF);
 
-        $family = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $family = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-        $controller
-        ->setPageTitle(I18N::translate('Change family members') . ' – ' . $family->getFullName())
-        ->pageHeader();
+            $controller
+            ->setPageTitle(I18N::translate('Change family members') . ' – ' . $family->getFullName())
+            ->pageHeader();
 
-        $father   = $family->getHusband();
-        $mother   = $family->getWife();
-        $children = $family->getChildren();
-        ?>
+            $father   = $family->getHusband();
+            $mother   = $family->getWife();
+            $children = $family->getChildren();
+            ?>
     <div id="edit_interface-page">
         <h2><?php echo $controller->getPageTitle(); ?></h2>
         <div id="changefam">
@@ -1903,7 +1903,7 @@ 
                         <td class="descriptionbox">
                             <b>
                                 <?php
-                                switch ($father->getSex()) {
+                                    switch ($father->getSex()) {
                                     case 'M':
                                         echo I18N::translate('husband');
                                         break;
@@ -1913,7 +1913,7 @@ 
                                     default:
                                         echo I18N::translate('spouse');
                                         break;
-                                }
+                                    }
                                 ?>
                             </b>
                             <input type="hidden" name="HUSB" value="<?php echo $father->getXref(); ?>">
@@ -2042,141 +2042,141 @@ 
         <?php
         break;
 
-    case 'changefamily_update':
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $HUSB      = Filter::post('HUSB', WT_REGEX_XREF);
-        $WIFE      = Filter::post('WIFE', WT_REGEX_XREF);
-        $keep_chan = Filter::postBool('keep_chan');
+        case 'changefamily_update':
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $HUSB      = Filter::post('HUSB', WT_REGEX_XREF);
+            $WIFE      = Filter::post('WIFE', WT_REGEX_XREF);
+            $keep_chan = Filter::postBool('keep_chan');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=changefamily&xref=' . $xref);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=changefamily&xref=' . $xref);
 
-            return;
-        }
+                return;
+            }
 
-        $CHIL = array();
-        for ($i = 0; isset($_POST['CHIL' . $i]); ++$i) {
-            $CHIL[] = Filter::post('CHIL' . $i, WT_REGEX_XREF);
-        }
+            $CHIL = array();
+            for ($i = 0; isset($_POST['CHIL' . $i]); ++$i) {
+                $CHIL[] = Filter::post('CHIL' . $i, WT_REGEX_XREF);
+            }
 
-        $family = Family::getInstance($xref, $WT_TREE);
-        check_record_access($family);
+            $family = Family::getInstance($xref, $WT_TREE);
+            check_record_access($family);
 
-        $controller
-        ->setPageTitle(I18N::translate('Change family members') . ' – ' . $family->getFullName())
-        ->pageHeader();
-
-        // Current family members
-        $old_father   = $family->getHusband();
-        $old_mother   = $family->getWife();
-        $old_children = $family->getChildren();
-
-        // New family members
-        $new_father   = Individual::getInstance($HUSB, $WT_TREE);
-        $new_mother   = Individual::getInstance($WIFE, $WT_TREE);
-        $new_children = array();
-        foreach ($CHIL as $child) {
-            $new_children[] = Individual::getInstance($child, $WT_TREE);
-        }
+            $controller
+            ->setPageTitle(I18N::translate('Change family members') . ' – ' . $family->getFullName())
+            ->pageHeader();
+
+            // Current family members
+            $old_father   = $family->getHusband();
+            $old_mother   = $family->getWife();
+            $old_children = $family->getChildren();
+
+            // New family members
+            $new_father   = Individual::getInstance($HUSB, $WT_TREE);
+            $new_mother   = Individual::getInstance($WIFE, $WT_TREE);
+            $new_children = array();
+            foreach ($CHIL as $child) {
+                $new_children[] = Individual::getInstance($child, $WT_TREE);
+            }
 
-        if ($old_father !== $new_father) {
-            if ($old_father) {
-                // Remove old FAMS link
-                foreach ($old_father->getFacts('FAMS') as $fact) {
-                    if ($fact->getTarget() === $family) {
-                        $old_father->deleteFact($fact->getFactId(), !$keep_chan);
+            if ($old_father !== $new_father) {
+                if ($old_father) {
+                    // Remove old FAMS link
+                    foreach ($old_father->getFacts('FAMS') as $fact) {
+                        if ($fact->getTarget() === $family) {
+                            $old_father->deleteFact($fact->getFactId(), !$keep_chan);
+                        }
                     }
-                }
-                // Remove old HUSB link
-                foreach ($family->getFacts('HUSB|WIFE') as $fact) {
-                    if ($fact->getTarget() === $old_father) {
-                        $family->deleteFact($fact->getFactId(), !$keep_chan);
+                    // Remove old HUSB link
+                    foreach ($family->getFacts('HUSB|WIFE') as $fact) {
+                        if ($fact->getTarget() === $old_father) {
+                            $family->deleteFact($fact->getFactId(), !$keep_chan);
+                        }
                     }
                 }
+                if ($new_father) {
+                    // Add new FAMS link
+                    $new_father->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
+                    // Add new HUSB link
+                    $family->createFact('1 HUSB @' . $new_father->getXref() . '@', !$keep_chan);
+                }
             }
-            if ($new_father) {
-                // Add new FAMS link
-                $new_father->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
-                // Add new HUSB link
-                $family->createFact('1 HUSB @' . $new_father->getXref() . '@', !$keep_chan);
-            }
-        }
 
-        if ($old_mother !== $new_mother) {
-            if ($old_mother) {
-                // Remove old FAMS link
-                foreach ($old_mother->getFacts('FAMS') as $fact) {
-                    if ($fact->getTarget() === $family) {
-                        $old_mother->deleteFact($fact->getFactId(), !$keep_chan);
+            if ($old_mother !== $new_mother) {
+                if ($old_mother) {
+                    // Remove old FAMS link
+                    foreach ($old_mother->getFacts('FAMS') as $fact) {
+                        if ($fact->getTarget() === $family) {
+                            $old_mother->deleteFact($fact->getFactId(), !$keep_chan);
+                        }
                     }
-                }
-                // Remove old WIFE link
-                foreach ($family->getFacts('HUSB|WIFE') as $fact) {
-                    if ($fact->getTarget() === $old_mother) {
-                        $family->deleteFact($fact->getFactId(), !$keep_chan);
+                    // Remove old WIFE link
+                    foreach ($family->getFacts('HUSB|WIFE') as $fact) {
+                        if ($fact->getTarget() === $old_mother) {
+                            $family->deleteFact($fact->getFactId(), !$keep_chan);
+                        }
                     }
                 }
+                if ($new_mother) {
+                    // Add new FAMS link
+                    $new_mother->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
+                    // Add new WIFE link
+                    $family->createFact('1 WIFE @' . $new_mother->getXref() . '@', !$keep_chan);
+                }
             }
-            if ($new_mother) {
-                // Add new FAMS link
-                $new_mother->createFact('1 FAMS @' . $family->getXref() . '@', !$keep_chan);
-                // Add new WIFE link
-                $family->createFact('1 WIFE @' . $new_mother->getXref() . '@', !$keep_chan);
-            }
-        }
 
-        foreach ($old_children as $old_child) {
-            if ($old_child && !in_array($old_child, $new_children)) {
-                // Remove old FAMC link
-                foreach ($old_child->getFacts('FAMC') as $fact) {
-                    if ($fact->getTarget() === $family) {
-                        $old_child->deleteFact($fact->getFactId(), !$keep_chan);
+            foreach ($old_children as $old_child) {
+                if ($old_child && !in_array($old_child, $new_children)) {
+                    // Remove old FAMC link
+                    foreach ($old_child->getFacts('FAMC') as $fact) {
+                        if ($fact->getTarget() === $family) {
+                            $old_child->deleteFact($fact->getFactId(), !$keep_chan);
+                        }
                     }
-                }
-                // Remove old CHIL link
-                foreach ($family->getFacts('CHIL') as $fact) {
-                    if ($fact->getTarget() === $old_child) {
-                        $family->deleteFact($fact->getFactId(), !$keep_chan);
+                    // Remove old CHIL link
+                    foreach ($family->getFacts('CHIL') as $fact) {
+                        if ($fact->getTarget() === $old_child) {
+                            $family->deleteFact($fact->getFactId(), !$keep_chan);
+                        }
                     }
                 }
             }
-        }
 
-        foreach ($new_children as $new_child) {
-            if ($new_child && !in_array($new_child, $old_children)) {
-                // Add new FAMC link
-                $new_child->createFact('1 FAMC @' . $family->getXref() . '@', !$keep_chan);
-                // Add new CHIL link
-                $family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
+            foreach ($new_children as $new_child) {
+                if ($new_child && !in_array($new_child, $old_children)) {
+                    // Add new FAMC link
+                    $new_child->createFact('1 FAMC @' . $family->getXref() . '@', !$keep_chan);
+                    // Add new CHIL link
+                    $family->createFact('1 CHIL @' . $new_child->getXref() . '@', !$keep_chan);
+                }
             }
-        }
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 
-////////////////////////////////////////////////////////////////////////////////
-// Change the order of FAMS records within an INDI record
-////////////////////////////////////////////////////////////////////////////////
-    case 'reorder_fams':
-        $xref   = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF));
-        $option = Filter::post('option');
+    ////////////////////////////////////////////////////////////////////////////////
+    // Change the order of FAMS records within an INDI record
+    ////////////////////////////////////////////////////////////////////////////////
+        case 'reorder_fams':
+            $xref   = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF));
+            $option = Filter::post('option');
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->addInlineJavascript('jQuery("#reorder_list").sortable({forceHelperSize: true, forcePlaceholderSize: true, opacity: 0.7, cursor: "move", axis: "y"});')
-        //-- update the order numbers after drag-n-drop sorting is complete
-        ->addInlineJavascript('jQuery("#reorder_list").bind("sortupdate", function(event, ui) { jQuery("#"+jQuery(this).attr("id")+" input").each( function (index, value) { value.value = index+1; }); });')
-        ->setPageTitle(I18N::translate('Re-order families'))
-        ->pageHeader();
-
-        $fams = $person->getSpouseFamilies();
-        if ($option === 'bymarriage') {
-            usort($fams, '\Fisharebest\Webtrees\Family::compareMarrDate');
-        }
+            $controller
+            ->addInlineJavascript('jQuery("#reorder_list").sortable({forceHelperSize: true, forcePlaceholderSize: true, opacity: 0.7, cursor: "move", axis: "y"});')
+            //-- update the order numbers after drag-n-drop sorting is complete
+            ->addInlineJavascript('jQuery("#reorder_list").bind("sortupdate", function(event, ui) { jQuery("#"+jQuery(this).attr("id")+" input").each( function (index, value) { value.value = index+1; }); });')
+            ->setPageTitle(I18N::translate('Re-order families'))
+            ->pageHeader();
+
+            $fams = $person->getSpouseFamilies();
+            if ($option === 'bymarriage') {
+                usort($fams, '\Fisharebest\Webtrees\Family::compareMarrDate');
+            }
 
-        ?>
+            ?>
     <div id="edit_interface-page">
     <h2><?php echo $controller->getPageTitle(); ?></h2>
     <form name="reorder_form" method="post" action="edit_interface.php">
@@ -2185,12 +2185,12 @@ 
         <input type="hidden" name="xref" value="<?php echo $xref; ?>">
         <input type="hidden" name="option" value="bymarriage">
         <?php echo Filter::getCsrf(); ?>
-        <ul id="reorder_list">
+            <ul id="reorder_list">
         <?php foreach ($fams as $n => $family) { ?>
-            <li class="facts_value" style="cursor:move;margin-bottom:2px;" id="li_<?php echo $family->getXref(); ?>">
+                <li class="facts_value" style="cursor:move;margin-bottom:2px;" id="li_<?php echo $family->getXref(); ?>">
                 <div class="name2"><?php echo $family->getFullName(); ?></div>
                 <?php echo $family->formatFirstMajorFact(WT_EVENTS_MARR, 2); ?>
-                <input type="hidden" name="order[<?php echo $family->getXref(); ?>]" value="<?php echo $n; ?>">
+                    <input type="hidden" name="order[<?php echo $family->getXref(); ?>]" value="<?php echo $n; ?>">
             </li>
         <?php } ?>
         </ul>
@@ -2202,48 +2202,48 @@ 
     </form>
     </div>
         <?php
-        break;
+            break;
 
-    case 'reorder_fams_update':
-        $xref  = Filter::post('xref', WT_REGEX_XREF);
-        $order = Filter::post('order');
+        case 'reorder_fams_update':
+            $xref  = Filter::post('xref', WT_REGEX_XREF);
+            $order = Filter::post('order');
 
-        if (!Filter::checkCsrf()) {
-            header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=reorder_fams&xref=' . $xref);
+            if (!Filter::checkCsrf()) {
+                header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME . '?action=reorder_fams&xref=' . $xref);
 
-            return;
-        }
+                return;
+            }
 
-        $person = Individual::getInstance($xref, $WT_TREE);
-        check_record_access($person);
+            $person = Individual::getInstance($xref, $WT_TREE);
+            check_record_access($person);
 
-        $controller
-        ->setPageTitle(I18N::translate('Re-order families'))
-        ->pageHeader();
-
-        if (is_array($order)) {
-            $gedcom = array('0 @' . $person->getXref() . '@ INDI');
-            $facts  = $person->getFacts();
-
-            // Move families to the end of the record
-            foreach ($order as $family => $num) {
-                foreach ($facts as $n => $fact) {
-                    if ($fact->getValue() === '@' . $family . '@') {
-                        $facts[] = $fact;
-                        unset($facts[$n]);
-                        break;
+            $controller
+            ->setPageTitle(I18N::translate('Re-order families'))
+            ->pageHeader();
+
+            if (is_array($order)) {
+                $gedcom = array('0 @' . $person->getXref() . '@ INDI');
+                $facts  = $person->getFacts();
+
+                // Move families to the end of the record
+                foreach ($order as $family => $num) {
+                    foreach ($facts as $n => $fact) {
+                        if ($fact->getValue() === '@' . $family . '@') {
+                            $facts[] = $fact;
+                            unset($facts[$n]);
+                            break;
+                        }
                     }
                 }
-            }
-            foreach ($facts as $fact) {
-                $gedcom[] = $fact->getGedcom();
-            }
+                foreach ($facts as $fact) {
+                    $gedcom[] = $fact->getGedcom();
+                }
 
-            $person->updateRecord(implode("\n", $gedcom), false);
-        }
+                $person->updateRecord(implode("\n", $gedcom), false);
+            }
 
-        $controller->addInlineJavascript('closePopupAndReloadParent();');
-        break;
+            $controller->addInlineJavascript('closePopupAndReloadParent();');
+            break;
 }
 
 /**