holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow including record indexes in regex pattern

Browse Source
This commit is contained in:
Nathan Gray 2014-06-18 17:25:48 +00:00
parent 228d3e9614
commit 3405d58c67
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
importexport/inc/class.importexport_helper_functions.inc.php
View File

@ -296,6 +296,7 @@ class importexport_helper_functions {
if ( empty( $conversion_string ) ) continue; if ( empty( $conversion_string ) ) continue;
// fetch patterns ($rvalues) // fetch patterns ($rvalues)
$rvalues = array();
$pat_reps = explode( $PSep, stripslashes( $conversion_string ) ); $pat_reps = explode( $PSep, stripslashes( $conversion_string ) );
foreach( $pat_reps as $k => $pat_rep ) { foreach( $pat_reps as $k => $pat_rep ) {
list( $pattern, $replace ) = explode( $ASep, $pat_rep, 2 ); list( $pattern, $replace ) = explode( $ASep, $pat_rep, 2 );
@ -319,6 +320,16 @@ class importexport_helper_functions {
} }
$c_functions = implode('|', $c_functions); $c_functions = implode('|', $c_functions);
foreach ( $rvalues as $pattern => $replace ) { foreach ( $rvalues as $pattern => $replace ) {
// Allow to include record indexes in pattern
$reg = '/\|\[([0-9]+)\]/';
while( preg_match( $reg, $pattern, $vars ) ) {
// expand all _record fields
$pattern = str_replace(
$CPre . $vars[1] . $CPos,
$_record[array_search($vars[1], array_keys($_record))],
$pattern
);
}
if( preg_match('/'. (string)$pattern.'/', $val) ) { if( preg_match('/'. (string)$pattern.'/', $val) ) {
$val = preg_replace( '/'.(string)$pattern.'/', $replace, (string)$val ); $val = preg_replace( '/'.(string)$pattern.'/', $replace, (string)$val );