fisharebest / webtrees

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

Braces +35 added lines, -14 removed lines

@@ -625,12 +625,15 @@ 
                     <a href="admin_site_upgrade.php" class="error">
                         <?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
                     </a>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <span class="text-danger">
                             webtrees 1.7 has reached end-of-life.
                             You should upgrade to webtrees 2.
                         </span>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                 </p>
                 <?php endif; ?>
             </div>
@@ -791,9 +794,12 @@ 
                                     <?php echo I18N::number($changes[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                             <td class="text-right flip">
                                 <?php if ($individuals[$tree->getTreeId()]): ?>
@@ -801,9 +807,12 @@ 
                                     <?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                                 </td>
                             <td class="text-right flip">
                                 <?php if ($families[$tree->getTreeId()]): ?>
@@ -811,9 +820,12 @@ 
                                     <?php echo I18N::number($families[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                                 </td>
                             <td class="text-right flip">
                                 <?php if ($sources[$tree->getTreeId()]): ?>
@@ -821,9 +833,12 @@ 
                                     <?php echo I18N::number($sources[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                             <td class="text-right flip">
                                 <?php if ($repositories[$tree->getTreeId()]): ?>
@@ -831,9 +846,12 @@ 
                                     <?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                             <td class="text-right flip">
                                 <?php if ($media[$tree->getTreeId()]): ?>
@@ -841,9 +859,12 @@ 
                                     <?php echo I18N::number($media[$tree->getTreeId()]); ?>
                                     <span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
                                 </a>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                 -
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </td>
                         </tr>
                         <?php endforeach; ?>