fisharebest / webtrees

admin_users.php

Braces +5 added lines, -2 removed lines

@@ -769,8 +769,11 @@
         <p>
         <?php if ($ucnt): ?>
             <input type="submit" value="<?php echo I18N::translate('delete'); ?>">
-            <?php else: ?>
-            <?php echo I18N::translate('Nothing found to cleanup'); ?>
+            <?php else {
+    : ?>
+            <?php echo I18N::translate('Nothing found to cleanup');
+}
+?>
             <?php endif; ?>
         </p>
     </form>

relationship.php

Braces +10 added lines, -4 removed lines

@@ -103,7 +103,8 @@ 
                     <?php if ($ancestors_only === '1'): ?>
                         <input type="hidden" name="ancestors" value="1">
                         <?php echo I18N::translate('Find relationships via ancestors') ?>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <label>
                             <input type="radio" name="ancestors" value="0" <?php echo $ancestors == 0 ? 'checked' : '' ?>>
                             <?php echo I18N::translate('Find any relationship') ?>
@@ -113,14 +114,17 @@ 
                             <input type="radio" name="ancestors" value="1" <?php echo $ancestors == 1 ? 'checked' : '' ?>>
                             <?php echo I18N::translate('Find relationships via ancestors') ?>
                         </label>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
 
                     <hr>
 
                     <?php if ($max_recursion == 0): ?>
                         <?php echo I18N::translate('Find the closest relationships') ?>
                         <input type="hidden" name="recursion" value="0">
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <label>
                             <input type="radio" name="recursion" value="0" <?php echo $recursion == 0 ? 'checked' : '' ?>>
                             <?php echo I18N::translate('Find the closest relationships') ?>
@@ -132,7 +136,9 @@ 
                                 <?php echo I18N::translate('Find all possible relationships') ?>
                             <?php else: ?>
                                 <?php echo I18N::translate('Find other relationships') ?>
-                            <?php endif; ?>
+                            <?php endif;
+}
+?>
                         </label>
                     <?php endif; ?>
                 </td>

admin_modules.php

Braces +40 added lines, -16 removed lines

@@ -176,9 +176,12 @@ 
                             <a href="<?php echo $module->getConfigLink() ?>">
                                 <?php echo $module->getTitle() ?> <i class="fa fa-cogs"></i>
                             </a>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             <?php echo $module->getTitle() ?>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                         <?php if (!in_array($module->getName(), Module::getCoreModuleNames())): ?>
                             <br>
                         <?php endif; ?>
@@ -202,23 +205,32 @@ 
                     <td class="text-center text-muted hidden-xs">
                         <?php if ($module instanceof ModuleMenuInterface): ?>
                             <i class="fa fa-list-ul" title="<?php echo I18N::translate('Menu') ?>"></i>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             -
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </td>
                     <td class="text-center text-muted hidden-xs">
                         <?php if ($module instanceof ModuleTabInterface): ?>
                             <i class="fa fa-folder" title="<?php echo I18N::translate('Tab') ?>"></i>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             -
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </td>
                     <td class="text-center text-muted hidden-xs">
                         <?php if ($module instanceof ModuleSidebarInterface): ?>
                             <i class="fa fa-th-large" title="<?php echo I18N::translate('Sidebar') ?>"></i>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             -
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </td>
                     <td class="text-center text-muted hidden-xs">
                         <?php if ($module instanceof ModuleBlockInterface): ?>
@@ -228,30 +240,42 @@ 
                             <?php if ($module->isUserBlock()): ?>
                                 <i class="fa fa-tree" title="<?php echo I18N::translate('Home page') ?>"></i>
                             <?php endif; ?>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             -
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </td>
                     <td class="text-center text-muted hidden-xs">
                         <?php if ($module instanceof ModuleChartInterface): ?>
                             <i class="fa fa-share-alt" title="<?php echo I18N::translate('Chart') ?>"></i>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             -
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </td>
                     <td class="text-center text-muted hidden-xs">
                         <?php if ($module instanceof ModuleReportInterface): ?>
                             <i class="fa fa-file" title="<?php echo I18N::translate('Report') ?>"></i>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             -
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </td>
                     <td class="text-center text-muted hidden">
                         <?php if ($module instanceof ModuleThemeInterface): ?>
                             <i class="fa fa-check" title="<?php echo I18N::translate('Theme') ?>"></i>
-                        <?php else: ?>
+                        <?php else {
+    : ?>
                             -
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
                     </td>
                 </tr>
             <?php endforeach; ?>

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_trees_duplicates.php

Braces +5 added lines, -2 removed lines

@@ -177,8 +177,11 @@
     </li>
 <?php endforeach; ?>
 </ul>
-<?php else: ?>
-<p><?php echo I18N::translate('No duplicates have been found.'); ?></p>
+<?php else {
+    : ?>
+<p><?php echo I18N::translate('No duplicates have been found.');
+}
+?></p>
 <?php endif; ?>
 
 <?php endforeach; ?>

admin_trees_manage.php

Braces +5 added lines, -2 removed lines

@@ -436,8 +436,11 @@
                                     <i class="fa fa-li fa-star"></i>
                                     <?php if ($tree->getName() == Site::getPreference('DEFAULT_GEDCOM')): ?>
                                         <?php echo I18N::translate('Default family tree'); ?>
-                                    <?php else: ?>
-                                        <a href="#" onclick="document.defaultform<?php echo $tree->getTreeId(); ?>.submit();">
+                                    <?php else {
+    : ?>
+                                        <a href="#" onclick="document.defaultform<?php echo $tree->getTreeId();
+}
+?>.submit();">
                                             <?php echo I18N::translate('Set as default'); ?>
                                             <span class="sr-only">
                                         <?php echo $tree->getTitleHtml(); ?>

admin_site_merge.php

Braces +20 added lines, -8 removed lines

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

admin_media.php

Braces +10 added lines, -4 removed lines

@@ -657,16 +657,22 @@
                     <div dir="ltr">
                         <?php if (count($media_folders) > 1): ?>
                             <?php echo WT_DATA_DIR, FunctionsEdit::selectEditControl('media_folder', $media_folders, null, $media_folder, 'onchange="this.form.submit();"'); ?>
-                        <?php else: ?>
-                        <?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder); ?>
+                        <?php else {
+    : ?>
+                        <?php echo WT_DATA_DIR, Filter::escapeHtml($media_folder);
+}
+?>
                         <input type="hidden" name="media_folder" value="<?php echo Filter::escapeHtml($media_folder); ?>">
                         <?php endif; ?>
                     </div>
 
                         <?php if (count($media_paths) > 1): ?>
                             <?php echo FunctionsEdit::selectEditControl('media_path', $media_paths, null, $media_path, 'onchange="this.form.submit();"'); ?>
-                    <?php else: ?>
-                    <?php echo Filter::escapeHtml($media_path); ?>
+                    <?php else {
+    : ?>
+                    <?php echo Filter::escapeHtml($media_path);
+}
+?>
                     <input type="hidden" name="media_path" value="<?php echo Filter::escapeHtml($media_path); ?>">
                     <?php endif; ?>