View GitHub Repository webtrees

Schedule Inspection
Subscribe
Passed
Push — 1.7 ( 6a2e59...b3bdc1 )
by Greg
05:29
created
Status
Category
Toggle Patches
search_advanced.php 1 patch
Braces   +92 added lines, -23 removed lines patch added patch discarded remove patch 
@@ -154,10 +154,22 @@  discard block
 
 block discarded – undo
154 154 
                 <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"' : ''; ?>>
155 155 
             <?php if (preg_match("/^NAME:/", $currentFieldSearch) > 0) { ?>
156 156 
                 <select name="fields[<?php echo $i; ?>]">
157 
-                    <option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
158 
-                    <option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
159 
-                    <option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
160 
-                    <option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
157 
+                    <option value="<?php echo $currentField; ?>:EXACT" <?php if (preg_match("/:EXACT$/", $currentFieldSearch) > 0) {
158 
+    echo 'selected';
159 
+}
160 
+?>><?php echo I18N::translate('Exact'); ?></option>
161 
+                    <option value="<?php echo $currentField; ?>:BEGINS" <?php if (preg_match("/:BEGINS$/", $currentFieldSearch) > 0) {
162 
+    echo 'selected';
163 
+}
164 
+?>><?php echo I18N::translate('Begins with'); ?></option>
165 
+                    <option value="<?php echo $currentField; ?>:CONTAINS" <?php if (preg_match("/:CONTAINS$/", $currentFieldSearch) > 0) {
166 
+    echo 'selected';
167 
+}
168 
+?>><?php echo I18N::translate('Contains'); ?></option>
169 
+                    <option value="<?php echo $currentField; ?>:SDX" <?php if (preg_match("/:SDX$/", $currentFieldSearch) > 0) {
170 
+    echo 'selected';
171 
+}
172 
+?>><?php echo I18N::translate('Sounds like'); ?></option>
161 173 
                 </select>
162 174 
             <?php } else { ?>
163 175 
             <input type="hidden" name="fields[<?php echo $i; ?>]" value="<?php echo $controller->getField($i); ?>">
 
@@ -166,9 +178,18 @@  discard block
 
 block discarded – undo
166 178 
     ?>
167 179 
                 <select name="plusminus[<?php echo $i; ?>]">
168 180 
                     <option value=""><?php echo I18N::translate('Exact date'); ?></option>
169 
-                    <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>
170 
-                    <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>
171 
-                    <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>
181 
+                    <option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 2) {
182 
+    echo 'selected';
183 
+}
184 
+?>><?php echo I18N::plural('±%s year', '±%s years', 2, I18N::number(2)); ?></option>
185 
+                    <option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 5) {
186 
+    echo 'selected';
187 
+}
188 
+?>><?php echo I18N::plural('±%s year', '±%s years', 5, I18N::number(5)); ?></option>
189 
+                    <option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i] == 10) {
190 
+    echo 'selected';
191 
+}
192 
+?>><?php echo I18N::plural('±%s year', '±%s years', 10, I18N::number(10)); ?></option>
172 193 
                 </select>
173 194 
             <?php } ?>
174 195 
         </td>
 
@@ -216,10 +237,22 @@  discard block
 
 block discarded – undo
216 237 
         <td class="list_value">
217 238 
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:GIVN:' . $fatherGivnOption)); ?>">
218 239 
             <select name="fields[<?php echo $j; ?>]">
219 
-                <option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
220 
-                <option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
221 
-                <option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
222 
-                <option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
240 
+                <option value="FAMC:HUSB:NAME:GIVN:EXACT" <?php if ($fatherGivnOption == 'EXACT') {
241 
+    echo 'selected';
242 
+}
243 
+?>><?php echo I18N::translate('Exact'); ?></option>
244 
+                <option value="FAMC:HUSB:NAME:GIVN:BEGINS" <?php if ($fatherGivnOption == 'BEGINS') {
245 
+    echo 'selected';
246 
+}
247 
+?>><?php echo I18N::translate('Begins with'); ?></option>
248 
+                <option value="FAMC:HUSB:NAME:GIVN:CONTAINS" <?php if ($fatherGivnOption == 'CONTAINS') {
249 
+    echo 'selected';
250 
+}
251 
+?>><?php echo I18N::translate('Contains'); ?></option>
252 
+                <option value="FAMC:HUSB:NAME:GIVN:SDX" <?php if ($fatherGivnOption == 'SDX') {
253 
+    echo 'selected';
254 
+}
255 
+?>><?php echo I18N::translate('Sounds like'); ?></option>
223 256 
             </select>
224 257 
         </td>
225 258 
     </tr>
 
@@ -231,10 +264,22 @@  discard block
 
 block discarded – undo
231 264 
         <td class="list_value">
232 265 
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:SURN:' . $fatherSurnOption)); ?>">
233 266 
             <select name="fields[<?php echo $j; ?>]">
234 
-                <option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
235 
-                <option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
236 
-                <option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
237 
-                <option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
267 
+                <option value="FAMC:HUSB:NAME:SURN:EXACT" <?php if ($fatherSurnOption == 'EXACT') {
268 
+    echo 'selected';
269 
+}
270 
+?>><?php echo I18N::translate('Exact'); ?></option>
271 
+                <option value="FAMC:HUSB:NAME:SURN:BEGINS" <?php if ($fatherSurnOption == 'BEGINS') {
272 
+    echo 'selected';
273 
+}
274 
+?>><?php echo I18N::translate('Begins with'); ?></option>
275 
+                <option value="FAMC:HUSB:NAME:SURN:CONTAINS" <?php if ($fatherSurnOption == 'CONTAINS') {
276 
+    echo 'selected';
277 
+}
278 
+?>><?php echo I18N::translate('Contains'); ?></option>
279 
+                <option value="FAMC:HUSB:NAME:SURN:SDX" <?php if ($fatherSurnOption == 'SDX') {
280 
+    echo 'selected';
281 
+}
282 
+?>><?php echo I18N::translate('Sounds like'); ?></option>
238 283 
             </select>
239 284 
         </td>
240 285 
     </tr>
 
@@ -252,10 +297,22 @@  discard block
 
 block discarded – undo
252 297 
         <td class="list_value">
253 298 
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:GIVN:' . $motherGivnOption)); ?>">
254 299 
             <select name="fields[<?php echo $j; ?>]">
255 
-                <option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
256 
-                <option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
257 
-                <option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') echo 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
258 
-                <option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
300 
+                <option value="FAMC:WIFE:NAME:GIVN:EXACT" <?php if ($motherGivnOption == 'EXACT') {
301 
+    echo 'selected';
302 
+}
303 
+?>><?php echo I18N::translate('Exact'); ?></option>
304 
+                <option value="FAMC:WIFE:NAME:GIVN:BEGINS" <?php if ($motherGivnOption == 'BEGINS') {
305 
+    echo 'selected';
306 
+}
307 
+?>><?php echo I18N::translate('Begins with'); ?></option>
308 
+                <option value="FAMC:WIFE:NAME:GIVN:CONTAINS" <?php if ($motherGivnOption == 'CONTAINS') {
309 
+    echo 'selected';
310 
+}
311 
+?>><?php echo I18N::translate('Contains'); ?></option>
312 
+                <option value="FAMC:WIFE:NAME:GIVN:SDX" <?php if ($motherGivnOption == 'SDX') {
313 
+    echo 'selected';
314 
+}
315 
+?>><?php echo I18N::translate('Sounds like'); ?></option>
259 316 
             </select>
260 317 
         </td>
261 318 
         <?php $j++; ?>
 
@@ -267,10 +324,22 @@  discard block
 
 block discarded – undo
267 324 
         <td class="list_value">
268 325 
             <input type="text" name="values[<?php echo $j; ?>]" value="<?php echo $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:SURN:' . $motherSurnOption)); ?>">
269 326 
             <select name="fields[<?php echo $j; ?>]">
270 
-                <option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') echo 'selected'; ?>><?php echo I18N::translate('Exact'); ?></option>
271 
-                <option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') echo 'selected'; ?>><?php echo I18N::translate('Begins with'); ?></option>
272 
-                <option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') 'selected'; ?>><?php echo I18N::translate('Contains'); ?></option>
273 
-                <option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') echo 'selected'; ?>><?php echo I18N::translate('Sounds like'); ?></option>
327 
+                <option value="FAMC:WIFE:NAME:SURN:EXACT" <?php if ($motherSurnOption == 'EXACT') {
328 
+    echo 'selected';
329 
+}
330 
+?>><?php echo I18N::translate('Exact'); ?></option>
331 
+                <option value="FAMC:WIFE:NAME:SURN:BEGINS" <?php if ($motherSurnOption == 'BEGINS') {
332 
+    echo 'selected';
333 
+}
334 
+?>><?php echo I18N::translate('Begins with'); ?></option>
335 
+                <option value="FAMC:WIFE:NAME:SURN:CONTAINS" <?php if ($motherSurnOption == 'CONTAINS') {
336 
+    'selected';
337 
+}
338 
+?>><?php echo I18N::translate('Contains'); ?></option>
339 
+                <option value="FAMC:WIFE:NAME:SURN:SDX" <?php if ($motherSurnOption == 'SDX') {
340 
+    echo 'selected';
341 
+}
342 
+?>><?php echo I18N::translate('Sounds like'); ?></option>
274 343 
             </select>
275 344 
         </td>
276 345 
         <?php $j++; ?>
Please login to merge, or discard this patch.