fisharebest / webtrees

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; ?>

search_advanced.php

Braces +92 added lines, -23 removed lines

@@ -154,10 +154,22 @@ 
                 <input type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo Filter::escapeHtml($controller->getValue($i)); ?>"<?php echo substr($controller->getField($i), -4) == 'PLAC' ? 'data-autocomplete-type="PLAC"' : ''; ?>>
             <?php if (preg_match("/^NAME:/", $currentFieldSearch) > 0) { ?>
                 <select name="fields[<?php echo $i; ?>]">
-                    <option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-                    <option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-                    <option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-                    <option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+                    <option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+                    <option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+                    <option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+                    <option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
                 </select>
             <?php } else { ?>
             <input type="hidden" name="fields[<?php echo $i; ?>]" value="<?php echo $controller->getField($i); ?>">
@@ -166,9 +178,18 @@ 
     ?>
                 <select name="plusminus[<?php echo $i; ?>]">
                     <option value=""><?php echo I18N::translate('Exact date'); ?></option>
-                    <option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 2, I18N::number(2)); ?></option>
-                    <option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
-                    <option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) echo 'selected'; ?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
+                    <option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
+    echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 2, I18N::number(2)); ?></option>
+                    <option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) {
+    echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
+                    <option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) {
+    echo 'selected';
+}
+?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
                 </select>
             <?php } ?>
         </td>
@@ -216,10 +237,22 @@ 
         <td class="list_value">
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:GIVN:' . $fatherGivnOption)); ?>">
             <select name="fields[<?php echo $j; ?>]">
-                <option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-                <option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-                <option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-                <option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+                <option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+                <option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+                <option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+                <option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
             </select>
         </td>
     </tr>
@@ -231,10 +264,22 @@ 
         <td class="list_value">
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:SURN:' . $fatherSurnOption)); ?>">
             <select name="fields[<?php echo $j; ?>]">
-                <option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-                <option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-                <option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-                <option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+                <option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+                <option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+                <option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+                <option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
             </select>
         </td>
     </tr>
@@ -252,10 +297,22 @@ 
         <td class="list_value">
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:GIVN:' . $motherGivnOption)); ?>">
             <select name="fields[<?php echo $j; ?>]">
-                <option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-                <option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-                <option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-                <option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+                <option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+                <option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+                <option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+                <option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
             </select>
         </td>
         <?php $j++; ?>
@@ -267,10 +324,22 @@ 
         <td class="list_value">
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:SURN:' . $motherSurnOption)); ?>">
             <select name="fields[<?php echo $j; ?>]">
-                <option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
-                <option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
-                <option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
-                <option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
+                <option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Exact'); ?></option>
+                <option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Begins with'); ?></option>
+                <option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') {
+    'selected';
+}
+?>><?php echo I18N::translate('Contains'); ?></option>
+                <option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') {
+    echo 'selected';
+}
+?>><?php echo I18N::translate('Sounds like'); ?></option>
             </select>
         </td>
         <?php $j++; ?>

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">

edituser.php

Braces +5 added lines, -2 removed lines

@@ -183,8 +183,11 @@
             <div class="value">
                 <?php if ($my_individual_record): ?>
                     <?php echo $my_individual_record->formatList('span'); ?>
-                <?php else: ?>
-                    <?php echo I18N::translateContext('unknown people', 'Unknown'); ?>
+                <?php else {
+    : ?>
+                    <?php echo I18N::translateContext('unknown people', 'Unknown');
+}
+?>
                 <?php endif; ?>
                 <p class="small text-muted">
                     <?php echo I18N::translate('This is a link to your own record in the family tree. If this is the wrong individual, contact an administrator.'); ?>

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; ?>
 

admin_module_reports.php

Braces +5 added lines, -2 removed lines

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