Skip to content

Finer custom fields match #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bloatware wants to merge 23 commits into
base: dev
Choose a base branch
from
Open

Finer custom fields match #792

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
75d2eb6
Enable pageby and pgonly for <txp:article_custom /> tag
bloatware Oct 3, 2016
f7cd268
Merge pull request #793 from textpattern/dev
bloatware Oct 3, 2016
c030699
Update publish.php
bloatware Oct 17, 2016
d7f7dc7
Update publish.php
bloatware Oct 18, 2016
1f4d82b
Merge pull request #819 from textpattern/dev
bloatware Oct 25, 2016
52f7cdf
Update publish.php
bloatware Oct 25, 2016
5bf985c
Update txplib_misc.php
bloatware Oct 25, 2016
62e8be2
Update taghandlers.php
bloatware Oct 25, 2016
91fd77b
Update txplib_misc.php
bloatware Oct 25, 2016
64491a7
Merge pull request #825 from textpattern/dev
bloatware Oct 26, 2016
f3083cc
Update taghandlers.php
bloatware Oct 26, 2016
f683eef
Merge pull request #829 from textpattern/dev
bloatware Oct 27, 2016
33d0898
Merge pull request #836 from textpattern/dev
bloatware Nov 7, 2016
d5ed528
Merge pull request #852 from textpattern/dev
bloatware Nov 29, 2016
b5f61bf
Merge pull request #882 from textpattern/dev
bloatware Feb 4, 2017
60ee085
Merge pull request #892 from textpattern/dev
bloatware Apr 2, 2017
8686d81
Update taghandlers.php
bloatware Dec 4, 2017
934704b
Update taghandlers.php
bloatware Dec 4, 2017
62b3381
Update README.md
petecooper Jul 16, 2021
26a8ba1
Update README.md
petecooper Sep 18, 2021
6dfed88
Update README.md
petecooper Dec 5, 2021
c63689e
Update README for Textpattern version 4.9.0
petecooper Jan 5, 2026
ac0e165
Add development tools documentation
petecooper Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update txplib_misc.php
  • Loading branch information
@bloatware
bloatware authored Oct 25, 2016
commit 91fd77b1b850865c41c7ce36e9ec3945186d1b05
22 changes: 13 additions & 9 deletions textpattern/lib/txplib_misc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4927,8 +4927,9 @@ function getCustomFields()
* Build a query qualifier to filter non-matching custom fields from the
* result set.
*
* @param array $custom An array of 'custom_field_name' => field_number tupels
* @param array $pairs Filter criteria: An array of 'name' => value tupels
* @param array $custom An array of 'custom_field_name' => field_number tupels
* @param array $pairs Filter criteria: An array of 'name' => value tupels
* @param string $match Match criteria: 'name1,name2[1|3]'
* @return bool|string An SQL qualifier for a query's 'WHERE' part
* @package CustomField
*/
Expand All @@ -4944,29 +4945,32 @@ function buildCustomSql($custom, $pairs, $match = null)
if (in_array($k, $custom)) {
$no = array_keys($custom, $k);
$custom_n = 'custom_'.$no[0];
$val = do_list($v, $sep);
$matched = false;

foreach ($match as $chunk) {
if (preg_match("/^{$k}\[(.*)\]$/", $chunk, $matches)) {
$matched = true;
$var = array();
$neg = '';

switch ($matches[1]) {
case 0 : $neg = 'NOT';
case '' :
foreach (do_list($v, $sep) as $val) {
$var[] = "CONCAT('".$sep."', {$custom_n}, '".$sep."') LIKE '%{$sep}{$val}{$sep}%'";
foreach ($val as $item) {
$var[] = "CONCAT('".$sep."', {$custom_n}, '".$sep."') LIKE '%{$sep}{$item}{$sep}%'";
}
break;
default:
default :
$ind = array_map('intval', do_list_unique($matches[1], '|'));
foreach (do_list($v, $sep) as $i => $val) {
if (in_array($i+1, $ind)) {
$var[] = "CONCAT('".$sep."', {$custom_n}, '".$sep."') LIKE '%{$sep}{$val}{$sep}%'";
foreach ($ind as $i) {
if (isset($val[$j = abs($i)-1])) {
$var[] = ($i < 0 ? 'NOT ' : '')."CONCAT('".$sep."', {$custom_n}, '".$sep."') LIKE '%{$sep}{$val[$j]}{$sep}%'";
}
}
}

$out[] = "AND (".implode(' OR ', $var).")";
$out[] = "AND $neg (".implode(' OR ', $var).")";
}
}

Expand Down