bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-18 08:19:05 +01:00
Code Issues Projects Releases Wiki Activity

function.php / getFData() : Added possibility to use %(...) syntax futhermore %{...}.x

Browse source
This commit is contained in:
Benjamin Renard 2011-04-13 16:44:09 +02:00
parent bd98151f81
commit a30262eb3c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
public_html/includes/functions.php
View file

@ -39,7 +39,7 @@
*/ */
function getFData($format,$data,$meth=NULL) { function getFData($format,$data,$meth=NULL) {
$unique=false; $unique=false;
$expr="%{([A-Za-z0-9]+)(\:(-?[0-9])+)?(\:(-?[0-9]+))?(-)?(\!|\_)?(~)?}"; $expr="%[{(]([A-Za-z0-9]+)(\:(-?[0-9])+)?(\:(-?[0-9]+))?(-)?(\!|\_)?(~)?[})]";
if(!is_array($format)) { if(!is_array($format)) {
$format=array($format); $format=array($format);
$unique=true; $unique=true;
@ -55,7 +55,7 @@ function getFData($format,$data,$meth=NULL) {
$val = $data[$ch[1]]; $val = $data[$ch[1]];
} }
$val=_getFData_extractAndModify($val,$ch); $val=_getFData_extractAndModify($val,$ch);
$format[$i]=ereg_replace($ch[0],$val,$format[$i]); $format[$i]=str_replace($ch[0],$val,$format[$i]);
} }
} }
else { else {
@ -66,7 +66,7 @@ function getFData($format,$data,$meth=NULL) {
$value = $value[0]; $value = $value[0];
} }
$value=_getFData_extractAndModify($value,$ch); $value=_getFData_extractAndModify($value,$ch);
$format[$i]=ereg_replace($ch[0],$value,$format[$i]); $format[$i]=str_replace($ch[0],$value,$format[$i]);
} }
else { else {
LSerror :: addErrorCode('fct_getFData_01',array('meth' => $meth,'obj' => $ch[1])); LSerror :: addErrorCode('fct_getFData_01',array('meth' => $meth,'obj' => $ch[1]));
@ -83,7 +83,7 @@ function getFData($format,$data,$meth=NULL) {
$value = $value[0]; $value = $value[0];
} }
$value=_getFData_extractAndModify($value,$ch); $value=_getFData_extractAndModify($value,$ch);
$format[$i]=ereg_replace($ch[0],$value,$format[$i]); $format[$i]=str_replace($ch[0],$value,$format[$i]);
} }
} }
else { else {
@ -94,7 +94,7 @@ function getFData($format,$data,$meth=NULL) {
$value = $value[0]; $value = $value[0];
} }
$value=_getFData_extractAndModify($value,$ch); $value=_getFData_extractAndModify($value,$ch);
$format[$i]=ereg_replace($ch[0],$value,$format[$i]); $format[$i]=str_replace($ch[0],$value,$format[$i]);
} }
else { else {
LSerror :: addErrorCode(0,getFData(_("Function 'getFData' : The method %{meth} of the object %{obj} doesn't exist."),array('meth' => $meth,'obj' => get_class($data)))); LSerror :: addErrorCode(0,getFData(_("Function 'getFData' : The method %{meth} of the object %{obj} doesn't exist."),array('meth' => $meth,'obj' => get_class($data))));
@ -106,7 +106,7 @@ function getFData($format,$data,$meth=NULL) {
else { else {
while (ereg($expr,$format[$i],$ch)) { while (ereg($expr,$format[$i],$ch)) {
$val=_getFData_extractAndModify($data,$ch); $val=_getFData_extractAndModify($data,$ch);
$format[$i]=ereg_replace($ch[0],$val,$format[$i]); $format[$i]=str_replace($ch[0],$val,$format[$i]);
} }
} }
} }
@ -171,10 +171,10 @@ function smarty_getFData($params) {
function getFieldInFormat($format) { function getFieldInFormat($format) {
$fields=array(); $fields=array();
$expr="%{([A-Za-z0-9]+)(\:(-?[0-9])+)?(\:(-?[0-9]+))?(-)?(\!|\_)?(~)?}"; $expr="%[{(]([A-Za-z0-9]+)(\:(-?[0-9])+)?(\:(-?[0-9]+))?(-)?(\!|\_)?(~)?[})]";
while (ereg($expr,$format,$ch)) { while (ereg($expr,$format,$ch)) {
$fields[]=$ch[1]; $fields[]=$ch[1];
$format=ereg_replace($ch[0],'',$format); $format=str_replace($ch[0],'',$format);
} }
return $fields; return $fields;
} }