diff options
| author | Greg Roach <fisharebest@gmail.com> | 2014-04-22 22:49:39 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2014-04-22 22:53:19 +0100 |
| commit | 808c8d857c2d6f5ca32a524bc75e6685a4cb0ced (patch) | |
| tree | aa21ab139a010b97d98c9a5744362ca79038e8e0 | |
| parent | 85683b68e8a099f9543752eb35ddb0ed54ff0dd6 (diff) | |
| download | webtrees-808c8d857c2d6f5ca32a524bc75e6685a4cb0ced.tar.gz webtrees-808c8d857c2d6f5ca32a524bc75e6685a4cb0ced.tar.bz2 webtrees-808c8d857c2d6f5ca32a524bc75e6685a4cb0ced.zip | |
#1311256
| -rw-r--r-- | lifespan.php | 6 | ||||
| -rw-r--r-- | reportengine.php | 4 | ||||
| -rw-r--r-- | search_advanced.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lifespan.php b/lifespan.php index 829ea395f5..58a9401f86 100644 --- a/lifespan.php +++ b/lifespan.php @@ -179,13 +179,13 @@ $people = count($controller->people); </select> </td> <td> - <input type="text" name="beginYear" size="5" value="<?php echo $controller->beginYear==0?'':$controller->beginYear; ?>"> + <input type="text" name="beginYear" size="5" value="<?php echo $controller->beginYear==0 ? '' : $controller->beginYear; ?>"> </td> <td> - <input type="text" name="endYear" size="5" value="<?php echo $controller->endYear==0?'':$controller->endYear; ?>"> + <input type="text" name="endYear" size="5" value="<?php echo $controller->endYear==0 ? '' : $controller->endYear; ?>"> </td> <td> - <input type="text" name="place" size="15" value="<?php echo $controller->place; ?>"> + <input type="text" name="place" size="15" value="<?php echo WT_Filter::escapeHtml($controller->place); ?>"> </td> <td> <input type="submit" name="search" value="<?php echo WT_I18N::translate('Search'); ?>"> diff --git a/reportengine.php b/reportengine.php index a35a89b963..88bdb3fa64 100644 --- a/reportengine.php +++ b/reportengine.php @@ -29,8 +29,8 @@ require WT_ROOT.'includes/functions/functions_rtl.php'; $controller=new WT_Controller_Page(); -$famid =WT_Filter::get('famid'); -$pid =WT_Filter::get('pid'); +$famid =WT_Filter::get('famid', WT_REGEX_XREF); +$pid =WT_Filter::get('pid', WT_REGEX_XREF); $action =WT_Filter::get('action', 'choose|setup|run', 'choose'); $report =WT_Filter::get('report'); $output =WT_Filter::get('output', 'HTML|PDF', 'PDF'); diff --git a/search_advanced.php b/search_advanced.php index aa911b8327..b262a4aefc 100644 --- a/search_advanced.php +++ b/search_advanced.php @@ -150,7 +150,7 @@ echo '</script>'; $currentFieldSearch = $controller->getField($i); // Get this field’s name and the search criterion $currentField = substr($currentFieldSearch, 0, strrpos($currentFieldSearch, ':')); // Get the actual field name ?> - <input tabindex="<?php echo $i+1; ?>" type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo $controller->getValue($i); ?>"<?php echo (substr($controller->getField($i),-4)=='PLAC') ? 'class="PLAC"' : ''; ?>> + <input tabindex="<?php echo $i+1; ?>" type="text" id="value<?php echo $i; ?>" name="values[<?php echo $i; ?>]" value="<?php echo WT_Filter::escapeHtml($controller->getValue($i)); ?>"<?php echo (substr($controller->getField($i),-4)=='PLAC') ? 'class="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=\"selected\""; ?>><?php echo WT_I18N::translate('Exact'); ?></option> |