diff options
| author | alecpl <alec@alec.pl> | 2009-05-04 08:03:48 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-05-04 08:03:48 +0000 |
| commit | db5abc6c211d78ad80b716ddef11eabe5e32f137 (patch) | |
| tree | 2a85daf1cbce05e8787f0f7af38110843821cf66 | |
| parent | 2f7405e3cec2dba156fe80ca0b041a218528562e (diff) | |
- ereg -> preg
| -rw-r--r-- | program/lib/enriched.inc | 2 | ||||
| -rw-r--r-- | program/lib/icl_commons.inc | 4 | ||||
| -rw-r--r-- | program/lib/tnef_decoder.inc | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/program/lib/enriched.inc b/program/lib/enriched.inc index 2435a8233..e3abd8c4f 100644 --- a/program/lib/enriched.inc +++ b/program/lib/enriched.inc @@ -45,7 +45,7 @@ function enriched_convert_formatting($body){ '</indentright>'=>'</span>'); while(list($find,$replace)=each($a)){ - $body = eregi_replace($find,$replace,$body); + $body = preg_replace('#'.$find.'#i', $replace, $body); } return $body; } diff --git a/program/lib/icl_commons.inc b/program/lib/icl_commons.inc index 599205178..87eed629f 100644 --- a/program/lib/icl_commons.inc +++ b/program/lib/icl_commons.inc @@ -48,8 +48,8 @@ function iil_utf7_decode($str, $raw=false){ } function iil_utf7_encode($str){ - if (!ereg("[\200-\237]",$str) && !ereg("[\241-\377]",$str)) - return $str; + if (!preg_match('/[\200-\237\241-\377]/', $str)) + return $str; $len = strlen($str); diff --git a/program/lib/tnef_decoder.inc b/program/lib/tnef_decoder.inc index 8e3682a9b..750faf657 100644 --- a/program/lib/tnef_decoder.inc +++ b/program/lib/tnef_decoder.inc @@ -185,12 +185,12 @@ function extract_mapi_attrs($buf, &$attachment_data) switch($attr_name) { case TNEF_MAPI_ATTACH_LONG_FILENAME: // used in preference to AFILENAME value - $attachment_data[0]['name'] = ereg_replace('.*[\/](.*)$', '\1', $value); // strip path + $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $value); // strip path break; case TNEF_MAPI_ATTACH_MIME_TAG: // Is this ever set, and what is format? - $attachment_data[0]['type0'] = ereg_replace('^(.*)/.*', '\1', $value); - $attachment_data[0]['type1'] = ereg_replace('.*/(.*)$', '\1', $value); + $attachment_data[0]['type0'] = preg_replace('/^(.*)\/.*/', '\1', $value); + $attachment_data[0]['type1'] = preg_replace('/.*\/(.*)$/', '\1', $value); break; case TNEF_MAPI_ATTACH_DATA: @@ -247,7 +247,7 @@ function tnef_decode_attachment(&$buf, &$attachment_data) case TNEF_AFILENAME: // filename $length = tnef_geti32($buf); - $attachment_data[0]['name'] = ereg_replace('.*[\/](.*)$', + $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', tnef_getx($length, $buf)); // strip path tnef_geti16($buf); //checksum |