Project

General

Profile

« Previous | Next » 

Revision a9bdbd97

Added by Jim Pingle over 3 years ago

Clean up pkg filter text before use. Fixes #12725

Also remove unnecessary echos of the value.

(cherry picked from commit 5d82cce0d615a76b738798577a28a15803e59aeb)

View differences:

src/usr/local/www/pkg.php
434 434 
									if ($sf['name'] == $_REQUEST['pkg_filter_type']) {
435 435 
										$filter_fieldname = $sf['fieldname'];
436 436 
										#Use a default regex on sortable fields when none is declared
437 
										$pkg_filter = cleanup_regex_pattern(htmlspecialchars(strip_tags($_REQUEST['pkg_filter'])));
437 438 
										if ($sf['regex']) {
438 
											$filter_regex = str_replace("%FILTERTEXT%", $_REQUEST['pkg_filter'], trim($sf['regex']));
439 
											$filter_regex = str_replace("%FILTERTEXT%", $pkg_filter, trim($sf['regex']));
439 440 
										} else {
440 
											$filter_regex = "/{$_REQUEST['pkg_filter']}/i";
441 
											$filter_regex = "/{$pkg_filter}/i";
441 442 
										}
442 443 
									}
443 444 
								}
......
452 453 
						$fieldname = $ip[xml_safe_fieldname($column['fieldname'])];
453 454 
						if ($column['fieldname'] == $filter_fieldname) {
454 455 
							if ($filter_regex) {
455 
								//echo "$filter_regex - $fieldname<p/>";
456 456 
								preg_match($filter_regex, $fieldname, $filter_matches);
457 457 
								break;
458 458 
							}
......
603 603 

  		




  604
  604
  
    
</form>


  		




  605
  605
  
    
<?php


  		




  606
  
  
    
echo "<!-- filter_fieldname: {$filter_fieldname} -->";


  		




  607
  
  
    
echo "<!-- filter_regex: {$filter_regex} -->";


  		




  608
  
  
    

  		




  609
  606
  
    
include("foot.inc"); ?>


  		












Also available in:  Unified diff