diff --git a/admin/fixuserpix.php b/admin/fixuserpix.php index b21f55b043a..e556023190f 100755 --- a/admin/fixuserpix.php +++ b/admin/fixuserpix.php @@ -252,9 +252,9 @@ if ($settings['eolchar'] == '
') { function arguments($argv) { $_ARG = array(); foreach ($argv as $arg) { - if (preg_match('/--?([^=]+)=(.*)/',$arg,$reg)) { + if (ereg('--?([^=]+)=(.*)',$arg,$reg)) { $_ARG[$reg[1]] = $reg[2]; - } elseif(preg_match('/-([a-zA-Z0-9]+)/',$arg,$reg)) { + } elseif(ereg('-([a-zA-Z0-9]+)',$arg,$reg)) { $_ARG[$reg[1]] = 'true'; } } diff --git a/admin/mnet/MethodTable.php b/admin/mnet/MethodTable.php index 6bd0bd6260d..e5e4b390f82 100644 --- a/admin/mnet/MethodTable.php +++ b/admin/mnet/MethodTable.php @@ -465,15 +465,15 @@ class MethodTable $word0 = strtolower($word0); $word1 = strtolower($word1); - $wordBase0 = preg_replace('/^[&$]+/','',$word0); - $wordBase1 = preg_replace('/^[&$]+/','',$word1); - $startBase = strtolower(preg_replace('/^[&$]+/','',$start)); + $wordBase0 = ereg_replace('^[&$]+','',$word0); + $wordBase1 = ereg_replace('^[&$]+','',$word1); + $startBase = strtolower(ereg_replace('^[&$]+','',$start)); if ($wordBase0 == $startBase) { $type = str_replace(array('(',')'),'', $word1); } elseif($wordBase1 == $startBase) { $type = str_replace(array('(',')'),'', $word0); - } elseif( preg_match('/(^[&$]+)|(\()([a-z0-9]+)(\)$)/', $word0, $regs) ) { + } elseif( ereg('(^[&$]+)|(\()([a-z0-9]+)(\)$)', $word0, $regs) ) { $tail = str_ireplace($word0, '', $end); $type = $regs[3]; } else { @@ -535,7 +535,7 @@ class MethodTable $comment = str_replace("*/", "", $comment); $comment = str_replace("*", "", $comment); $comment = str_replace("\n", "\\n", trim($comment)); - $comment = preg_replace("/[\r\t\n ]+/i", " ", trim($comment)); + $comment = eregi_replace("[\r\t\n ]+", " ", trim($comment)); $comment = str_replace("\"", "\\\"", $comment); return $comment; } diff --git a/admin/uploaduser.php b/admin/uploaduser.php index 3d8ba3d7e4a..9781ccdec14 100755 --- a/admin/uploaduser.php +++ b/admin/uploaduser.php @@ -260,7 +260,7 @@ if ($formdata = $mform->is_cancelled()) { // normalize username $user->username = $textlib->strtolower($user->username); if (empty($CFG->extendedusernamechars)) { - $user->username = preg_replace('/[^(-\.[:alnum:])]/i', '', $user->username); + $user->username = eregi_replace('[^(-\.[:alnum:])]', '', $user->username); } if (empty($user->username)) { $upt->track('status', get_string('missingfield', 'error', 'username'), 'error'); diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php index 213278c447a..9fcfdbf7807 100644 --- a/auth/shibboleth/auth.php +++ b/auth/shibboleth/auth.php @@ -63,7 +63,7 @@ class auth_plugin_shibboleth extends auth_plugin_base { } else { // Try to find out using the user's cookie foreach ($_COOKIE as $name => $value){ - if (preg_match('/_shibsession_/i', $name)){ + if (eregi('_shibsession_', $name)){ $sessionkey = $value; } } diff --git a/auth/shibboleth/logout.php b/auth/shibboleth/logout.php index f9f06bbf267..24ab73a7b79 100644 --- a/auth/shibboleth/logout.php +++ b/auth/shibboleth/logout.php @@ -139,7 +139,7 @@ function LogoutNotification($SessionID){ while (($file = readdir($dh)) !== false) { // Check if it is a file if (is_file($dir.'/'.$file)){ - $session_key = preg_replace('/sess_/', '', $file); + $session_key = ereg_replace('sess_', '', $file); // Read session file data $data = file($dir.'/'.$file); diff --git a/enrol/authorize/enrol_form.php b/enrol/authorize/enrol_form.php index 716e45f5b3e..0182076fccc 100755 --- a/enrol/authorize/enrol_form.php +++ b/enrol/authorize/enrol_form.php @@ -246,7 +246,7 @@ class enrol_authorize_form extends moodleform function validate_aba($aba) { - if (preg_match("/^[0-9]{9}$/", $aba)) { + if (ereg("^[0-9]{9}$", $aba)) { $n = 0; for($i = 0; $i < 9; $i += 3) { $n += (substr($aba, $i, 1) * 3) + (substr($aba, $i + 1, 1) * 7) + (substr($aba, $i + 2, 1)); @@ -276,45 +276,45 @@ class enrol_authorize_form extends moodleform $GoodCard = true; // Get rid of any non-digits - $Num = preg_replace("/[^0-9]/", "", $Num); + $Num = ereg_replace("[^0-9]", "", $Num); // Perform card-specific checks, if applicable switch ($Name) { case "mcd" : - $GoodCard = preg_match("/^5[1-5].{14}$/", $Num); + $GoodCard = ereg("^5[1-5].{14}$", $Num); break; case "vis" : - $GoodCard = preg_match("/^4.{15}$|^4.{12}$/", $Num); + $GoodCard = ereg("^4.{15}$|^4.{12}$", $Num); break; case "amx" : - $GoodCard = preg_match("/^3[47].{13}$/", $Num); + $GoodCard = ereg("^3[47].{13}$", $Num); break; case "dsc" : - $GoodCard = preg_match("/^6011.{12}$/", $Num); + $GoodCard = ereg("^6011.{12}$", $Num); break; case "dnc" : - $GoodCard = preg_match("/^30[0-5].{11}$|^3[68].{12}$/", $Num); + $GoodCard = ereg("^30[0-5].{11}$|^3[68].{12}$", $Num); break; case "jcb" : - $GoodCard = preg_match("/^3.{15}$|^2131|1800.{11}$/", $Num); + $GoodCard = ereg("^3.{15}$|^2131|1800.{11}$", $Num); break; case "dlt" : - $GoodCard = preg_match("/^4.{15}$/", $Num); + $GoodCard = ereg("^4.{15}$", $Num); break; case "swi" : - $GoodCard = preg_match("/^[456].{15}$|^[456].{17,18}$/", $Num); + $GoodCard = ereg("^[456].{15}$|^[456].{17,18}$", $Num); break; case "enr" : - $GoodCard = preg_match("/^2014.{11}$|^2149.{11}$/", $Num); + $GoodCard = ereg("^2014.{11}$|^2149.{11}$", $Num); break; } diff --git a/filter/tex/filter.php b/filter/tex/filter.php index deb52eca44b..d067fbc7fe7 100644 --- a/filter/tex/filter.php +++ b/filter/tex/filter.php @@ -146,7 +146,7 @@ function tex_filter ($courseid, $text) { $texexp = str_replace('','',$texexp); $texexp = str_replace('','',$texexp); $texexp = str_replace('','',$texexp); - $texexp = preg_replace("##i", '', $texexp); //dlnsk + $texexp = eregi_replace("", '', $texexp); //dlnsk $align = "middle"; if (preg_match('/^align=bottom /',$texexp)) { $align = "text-bottom"; diff --git a/lib/bennu/iCalendar_rfc2445.php b/lib/bennu/iCalendar_rfc2445.php index 410f55000bc..053adcc9374 100644 --- a/lib/bennu/iCalendar_rfc2445.php +++ b/lib/bennu/iCalendar_rfc2445.php @@ -139,13 +139,13 @@ function rfc2445_is_valid_value($value, $type) { } if($scheme === 'mailto') { - $regexp = '#^[a-zA-Z0-9]+[_a-zA-Z0-9\-]*(\.[_a-z0-9\-]+)*@(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})$#'; + $regexp = '^[a-zA-Z0-9]+[_a-zA-Z0-9\-]*(\.[_a-z0-9\-]+)*@(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})$'; } else { - $regexp = '#^//(.+(:.*)?@)?(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})(:[0-9]{1,5})?(/.*)?$#'; + $regexp = '^//(.+(:.*)?@)?(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})(:[0-9]{1,5})?(/.*)?$'; } - return preg_match($regexp, $remain); + return ereg($regexp, $remain); break; case RFC2445_TYPE_BINARY: diff --git a/lib/bennu/readme_moodle.txt b/lib/bennu/readme_moodle.txt deleted file mode 100644 index ab351e4ea98..00000000000 --- a/lib/bennu/readme_moodle.txt +++ /dev/null @@ -1,27 +0,0 @@ -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: iCalendar_rfc2445.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/bennu/iCalendar_rfc2445.php,v -retrieving revision 1.2.10.1 -diff -u -r1.2.10.1 iCalendar_rfc2445.php ---- iCalendar_rfc2445.php 12 Oct 2009 05:08:02 -0000 1.2.10.1 -+++ iCalendar_rfc2445.php 18 Nov 2009 06:19:31 -0000 -@@ -139,13 +139,13 @@ - } - - if($scheme === 'mailto') { -- $regexp = '^[a-zA-Z0-9]+[_a-zA-Z0-9\-]*(\.[_a-z0-9\-]+)*@(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})$'; -+ $regexp = '#^[a-zA-Z0-9]+[_a-zA-Z0-9\-]*(\.[_a-z0-9\-]+)*@(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})$#'; - } - else { -- $regexp = '^//(.+(:.*)?@)?(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})(:[0-9]{1,5})?(/.*)?$'; -+ $regexp = '#^//(.+(:.*)?@)?(([0-9a-zA-Z\-]+\.)+[a-zA-Z][0-9a-zA-Z\-]+|([0-9]{1,3}\.){3}[0-9]{1,3})(:[0-9]{1,5})?(/.*)?$#'; - } - -- return ereg($regexp, $remain); -+ return preg_match($regexp, $remain); - break; - - case RFC2445_TYPE_BINARY: diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php index 8de43b9205e..708c596ac98 100644 --- a/lib/deprecatedlib.php +++ b/lib/deprecatedlib.php @@ -1001,7 +1001,7 @@ function detect_munged_arguments($string, $allowdots=1) { if (substr_count($string, '..') > $allowdots) { // Sometimes we allow dots in references return true; } - if (preg_match('/[\|\`]/i', $string)) { // check for other bad characters + if (ereg('[\|\`]', $string)) { // check for other bad characters return true; } if (empty($string) or $string == '/') { diff --git a/lib/excel/Parser.php b/lib/excel/Parser.php index 3d3e92e7da8..e1882e725d0 100644 --- a/lib/excel/Parser.php +++ b/lib/excel/Parser.php @@ -466,7 +466,7 @@ class Parser { return(pack("C", $this->ptg[$token])); } - elseif(preg_match("/[A-Z0-9�-�\.]+/",$token)) + elseif(preg_match("/[A-Z0-9-\.]+/",$token)) { return($this->_convert_function($token,$this->_func_args)); } @@ -723,21 +723,21 @@ class Parser break; default: // if it's a reference - if(preg_match("/^[A-I]?[A-Z][0-9]+$/i",$token) and - !preg_match("/[0-9]/",$this->_lookahead) and + if(eregi("^[A-I]?[A-Z][0-9]+$",$token) and + !ereg("[0-9]",$this->_lookahead) and ($this->_lookahead != ':') and ($this->_lookahead != '.')) { return($token); } // if it's a range (A1:A2) - elseif(preg_match("/^[A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$/i",$token) and - !preg_match("/[0-9]/",$this->_lookahead)) + elseif(eregi("^[A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$",$token) and + !ereg("[0-9]",$this->_lookahead)) { return($token); } // if it's a range (A1..A2) - elseif(preg_match("/^[A-I]?[A-Z][0-9]+\.\.[A-I]?[A-Z][0-9]+$/i",$token) and - !preg_match("/[0-9]/",$this->_lookahead)) + elseif(eregi("^[A-I]?[A-Z][0-9]+\.\.[A-I]?[A-Z][0-9]+$",$token) and + !ereg("[0-9]",$this->_lookahead)) { return($token); } @@ -746,7 +746,7 @@ class Parser return($token); } // if it's a function call - elseif(preg_match("/^[A-Z0-9�-�\.]+$/i",$token) and ($this->_lookahead == "(")) + elseif(eregi("^[A-Z0-9-\.]+$",$token) and ($this->_lookahead == "(")) { return($token); @@ -857,15 +857,15 @@ class Parser return($result); } // if it's a reference - if (preg_match("/^[A-I]?[A-Z][0-9]+$/i",$this->_current_token)) + if (eregi("^[A-I]?[A-Z][0-9]+$",$this->_current_token)) { $result = $this->_create_tree($this->_current_token, '', ''); $this->_advance(); return($result); } // if it's a range - elseif (preg_match("/^[A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$/i",$this->_current_token) or - preg_match("/^[A-I]?[A-Z][0-9]+\.\.[A-I]?[A-Z][0-9]+$/i",$this->_current_token)) + elseif (eregi("^[A-I]?[A-Z][0-9]+:[A-I]?[A-Z][0-9]+$",$this->_current_token) or + eregi("^[A-I]?[A-Z][0-9]+\.\.[A-I]?[A-Z][0-9]+$",$this->_current_token)) { $result = $this->_current_token; $this->_advance(); @@ -878,7 +878,7 @@ class Parser return($result); } // if it's a function call - elseif (preg_match("/^[A-Z0-9�-�\.]+$/i",$this->_current_token)) + elseif (eregi("^[A-Z0-9-\.]+$",$this->_current_token)) { $result = $this->_func(); return($result); diff --git a/lib/excel/readme_moodle.txt b/lib/excel/readme_moodle.txt index f33b3cdc2c3..0d885f5c56c 100644 --- a/lib/excel/readme_moodle.txt +++ b/lib/excel/readme_moodle.txt @@ -1,5 +1,5 @@ 18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. +Description of WriteExcel modifications to remove functions deprecated as of php 5.3 Index: Parser.php =================================================================== @@ -7,7 +7,7 @@ RCS file: /cvsroot/moodle/moodle/lib/excel/Parser.php,v retrieving revision 1.1 diff -u -r1.1 Parser.php --- Parser.php 26 Sep 2003 04:18:02 -0000 1.1 -+++ Parser.php 18 Nov 2009 06:27:54 -0000 ++++ Parser.php 18 Nov 2009 03:58:49 -0000 @@ -466,7 +466,7 @@ { return(pack("C", $this->ptg[$token])); @@ -88,7 +88,7 @@ RCS file: /cvsroot/moodle/moodle/lib/excel/Worksheet.php,v retrieving revision 1.1 diff -u -r1.1 Worksheet.php --- Worksheet.php 26 Sep 2003 04:18:02 -0000 1.1 -+++ Worksheet.php 18 Nov 2009 06:27:55 -0000 ++++ Worksheet.php 18 Nov 2009 03:58:50 -0000 @@ -1264,10 +1264,10 @@ } diff --git a/lib/filelib.php b/lib/filelib.php index b5a1d848a79..098c3e39093 100644 --- a/lib/filelib.php +++ b/lib/filelib.php @@ -496,7 +496,7 @@ function mimeinfo($element, $filename) { $mimeinfo = get_mimetypes_array(); } - if (preg_match('/\.([a-z0-9]+)$/i', $filename, $match)) { + if (eregi('\.([a-z0-9]+)$', $filename, $match)) { if (isset($mimeinfo[strtolower($match[1])][$element])) { return $mimeinfo[strtolower($match[1])][$element]; } else { diff --git a/lib/fpdf/font/makefont/makefont.php b/lib/fpdf/font/makefont/makefont.php index 35c2be6bd71..17348ab4ae7 100755 --- a/lib/fpdf/font/makefont/makefont.php +++ b/lib/fpdf/font/makefont/makefont.php @@ -171,7 +171,7 @@ function MakeFontDescriptor($fm,$symbolic) //StemV if(isset($fm['StdVW'])) $stemv=$fm['StdVW']; - elseif(isset($fm['Weight']) and preg_match('/(bold|black)/i',$fm['Weight'])) + elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight'])) $stemv=120; else $stemv=70; diff --git a/lib/fpdf/readme_moodle.txt b/lib/fpdf/readme_moodle.txt deleted file mode 100644 index 000cf325d7c..00000000000 --- a/lib/fpdf/readme_moodle.txt +++ /dev/null @@ -1,19 +0,0 @@ -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: font/makefont/makefont.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/fpdf/font/makefont/Attic/makefont.php,v -retrieving revision 1.2 -diff -u -r1.2 makefont.php ---- font/makefont/makefont.php 16 May 2006 06:45:14 -0000 1.2 -+++ font/makefont/makefont.php 18 Nov 2009 06:32:46 -0000 -@@ -171,7 +171,7 @@ - //StemV - if(isset($fm['StdVW'])) - $stemv=$fm['StdVW']; -- elseif(isset($fm['Weight']) and eregi('(bold|black)',$fm['Weight'])) -+ elseif(isset($fm['Weight']) and preg_match('/(bold|black)/i',$fm['Weight'])) - $stemv=120; - else - $stemv=70; diff --git a/lib/geoip/geoip.inc b/lib/geoip/geoip.inc index 42517db9103..a0954699575 100644 --- a/lib/geoip/geoip.inc +++ b/lib/geoip/geoip.inc @@ -490,7 +490,7 @@ function getdnsattributes ($l,$ip){ $r->nameservers = array("ws1.maxmind.com"); $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN"); $str = is_object($p->answer[0])?$p->answer[0]->string():''; - preg_match("/\"(.*)\"/",$str,$regs); + ereg("\"(.*)\"",$str,$regs); $str = $regs[1]; return $str; } diff --git a/lib/geoip/readme_moodle.txt b/lib/geoip/readme_moodle.txt deleted file mode 100644 index 96b352cb509..00000000000 --- a/lib/geoip/readme_moodle.txt +++ /dev/null @@ -1,19 +0,0 @@ -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: geoip.inc -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/geoip/geoip.inc,v -retrieving revision 1.1.2.2 -diff -u -r1.1.2.2 geoip.inc ---- geoip.inc 2 Jan 2008 16:49:05 -0000 1.1.2.2 -+++ geoip.inc 18 Nov 2009 06:34:59 -0000 -@@ -490,7 +490,7 @@ - $r->nameservers = array("ws1.maxmind.com"); - $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN"); - $str = is_object($p->answer[0])?$p->answer[0]->string():''; -- ereg("\"(.*)\"",$str,$regs); -+ preg_match("/\"(.*)\"/",$str,$regs); - $str = $regs[1]; - return $str; - } diff --git a/lib/htmlpurifier/HTMLPurifier/AttrDef/Lang.php b/lib/htmlpurifier/HTMLPurifier/AttrDef/Lang.php index 4e2b6820cbb..e9cdda7adf9 100644 --- a/lib/htmlpurifier/HTMLPurifier/AttrDef/Lang.php +++ b/lib/htmlpurifier/HTMLPurifier/AttrDef/Lang.php @@ -12,7 +12,7 @@ class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef function validate($string, $config, &$context) { // moodle change - we use special lang strings unfortunatelly - return preg_replace('/[^0-9a-zA-Z_-]/', '', $string); + return ereg_replace('[^0-9a-zA-Z_-]', '', $string); // moodle change end $string = trim($string); diff --git a/lib/htmlpurifier/readme_moodle.txt b/lib/htmlpurifier/readme_moodle.txt index d456361f604..40e2b3deae3 100644 --- a/lib/htmlpurifier/readme_moodle.txt +++ b/lib/htmlpurifier/readme_moodle.txt @@ -8,24 +8,3 @@ Changes: skodak $Id$ - - -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: HTMLPurifier/AttrDef/Lang.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/htmlpurifier/HTMLPurifier/AttrDef/Lang.php,v -retrieving revision 1.3 -diff -u -r1.3 Lang.php ---- HTMLPurifier/AttrDef/Lang.php 25 Sep 2007 14:34:13 -0000 1.3 -+++ HTMLPurifier/AttrDef/Lang.php 18 Nov 2009 06:37:14 -0000 -@@ -12,7 +12,7 @@ - function validate($string, $config, &$context) { - - // moodle change - we use special lang strings unfortunatelly -- return ereg_replace('[^0-9a-zA-Z_-]', '', $string); -+ return preg_replace('/[^0-9a-zA-Z_-]/', '', $string); - // moodle change end - - $string = trim($string); diff --git a/lib/pclzip/pclzip.lib.php b/lib/pclzip/pclzip.lib.php index f469325bae6..e72737b7aa2 100644 --- a/lib/pclzip/pclzip.lib.php +++ b/lib/pclzip/pclzip.lib.php @@ -3245,9 +3245,7 @@ } // ----- Look for extract by ereg rule - /* - * MDL-20821 ereg is now deprecated - else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) + else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) && ($p_options[PCLZIP_OPT_BY_EREG] != "")) { //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'"); @@ -3255,7 +3253,7 @@ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); $v_extract = true; } - }*/ + } // ----- Look for extract by preg rule else if ( (isset($p_options[PCLZIP_OPT_BY_PREG])) @@ -4686,8 +4684,6 @@ } // ----- Look for extract by ereg rule - /* - * MDL-20821 ereg is now deprecated else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) && ($p_options[PCLZIP_OPT_BY_EREG] != "")) { //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'"); @@ -4696,7 +4692,7 @@ //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); $v_found = true; } - }*/ + } // ----- Look for extract by preg rule else if ( (isset($p_options[PCLZIP_OPT_BY_PREG])) diff --git a/lib/pclzip/readme_moodle.txt b/lib/pclzip/readme_moodle.txt index 27cdb831123..b12050e23fd 100644 --- a/lib/pclzip/readme_moodle.txt +++ b/lib/pclzip/readme_moodle.txt @@ -5,54 +5,4 @@ Changes: * removed PclZipUtilTranslateWinPath from line 1958 - see MDL-7828 skodak -$Id$ - - -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: pclzip.lib.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/pclzip/Attic/pclzip.lib.php,v -retrieving revision 1.15 -diff -u -r1.15 pclzip.lib.php ---- pclzip.lib.php 28 Mar 2007 07:17:26 -0000 1.15 -+++ pclzip.lib.php 18 Nov 2009 06:40:48 -0000 -@@ -3245,7 +3245,9 @@ - } - - // ----- Look for extract by ereg rule -- else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) -+ /* -+ * MDL-20821 ereg is now deprecated -+ else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) - && ($p_options[PCLZIP_OPT_BY_EREG] != "")) { - //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'"); - -@@ -3253,7 +3255,7 @@ - //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); - $v_extract = true; - } -- } -+ }*/ - - // ----- Look for extract by preg rule - else if ( (isset($p_options[PCLZIP_OPT_BY_PREG])) -@@ -4684,6 +4686,8 @@ - } - - // ----- Look for extract by ereg rule -+ /* -+ * MDL-20821 ereg is now deprecated - else if ( (isset($p_options[PCLZIP_OPT_BY_EREG])) - && ($p_options[PCLZIP_OPT_BY_EREG] != "")) { - //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract by ereg '".$p_options[PCLZIP_OPT_BY_EREG]."'"); -@@ -4692,7 +4696,7 @@ - //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filename match the regular expression"); - $v_found = true; - } -- } -+ }*/ - - // ----- Look for extract by preg rule - else if ( (isset($p_options[PCLZIP_OPT_BY_PREG])) +$Id$ \ No newline at end of file diff --git a/lib/pear/README_MOODLE.txt b/lib/pear/README_MOODLE.txt index 747b2beca38..b9b23672098 100644 --- a/lib/pear/README_MOODLE.txt +++ b/lib/pear/README_MOODLE.txt @@ -12,103 +12,3 @@ to a new release within Moodle. stronk7 $Id$ - - -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: Spreadsheet/Excel/Writer/Parser.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/pear/Spreadsheet/Excel/Writer/Parser.php,v -retrieving revision 1.2 -diff -u -r1.2 Parser.php ---- Spreadsheet/Excel/Writer/Parser.php 4 Jan 2006 08:23:42 -0000 1.2 -+++ Spreadsheet/Excel/Writer/Parser.php 18 Nov 2009 06:42:45 -0000 -@@ -1206,7 +1206,7 @@ - default: - // if it's a reference - if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and -- !ereg("[0-9]",$this->_lookahead) and -+ !preg_match("/[0-9]/",$this->_lookahead) and - ($this->_lookahead != ':') and ($this->_lookahead != '.') and - ($this->_lookahead != '!')) - { -@@ -1214,39 +1214,39 @@ - } - // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1) - elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z][0-9]+$/u",$token) and -- !ereg("[0-9]",$this->_lookahead) and -+ !preg_match("/[0-9]/",$this->_lookahead) and - ($this->_lookahead != ':') and ($this->_lookahead != '.')) - { - return $token; - } - // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1) - elseif (preg_match("/^'[\w -]+(\:[\w -]+)?'\![A-Ia-i]?[A-Za-z][0-9]+$/u",$token) and -- !ereg("[0-9]",$this->_lookahead) and -+ !preg_match("/[0-9]/",$this->_lookahead) and - ($this->_lookahead != ':') and ($this->_lookahead != '.')) - { - return $token; - } - // if it's a range (A1:A2) - elseif (preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/",$token) and -- !ereg("[0-9]",$this->_lookahead)) -+ !preg_match("/[0-9]/",$this->_lookahead)) - { - return $token; - } - // if it's a range (A1..A2) - elseif (preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/",$token) and -- !ereg("[0-9]",$this->_lookahead)) -+ !preg_match("/[0-9]/",$this->_lookahead)) - { - return $token; - } - // If it's an external range like Sheet1!A1 or Sheet1:Sheet2!A1:B2 - elseif (preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$token) and -- !ereg("[0-9]",$this->_lookahead)) -+ !preg_match("/[0-9]/",$this->_lookahead)) - { - return $token; - } - // If it's an external range like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1:B2 - elseif (preg_match("/^'[\w -]+(\:[\w -]+)?'\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$token) and -- !ereg("[0-9]",$this->_lookahead)) -+ !preg_match("/[0-9]/",$this->_lookahead)) - { - return $token; - } -@@ -1258,12 +1258,12 @@ - return $token; - } - // If it's a string (of maximum 255 characters) -- elseif (ereg("^\"[^\"]{0,255}\"$",$token)) -+ elseif (preg_match("/^\"[^\"]{0,255}\"$/",$token)) - { - return $token; - } - // if it's a function call -- elseif (eregi("^[A-Z0-9\xc0-\xdc\.]+$",$token) and ($this->_lookahead == "(")) -+ elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$token) and ($this->_lookahead == "(")) - { - return $token; - } -@@ -1363,7 +1363,7 @@ - function _expression() - { - // If it's a string return a string node -- if (ereg("^\"[^\"]{0,255}\"$", $this->_current_token)) { -+ if (preg_match("/^\"[^\"]{0,255}\"$/", $this->_current_token)) { - $result = $this->_createTree($this->_current_token, '', ''); - $this->_advance(); - return $result; -@@ -1521,7 +1521,7 @@ - return $result; - } - // if it's a function call -- elseif (eregi("^[A-Z0-9\xc0-\xdc\.]+$",$this->_current_token)) -+ elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token)) - { - $result = $this->_func(); - return $result; diff --git a/lib/pear/Spreadsheet/Excel/Writer/Parser.php b/lib/pear/Spreadsheet/Excel/Writer/Parser.php index c34453687a3..a8730343fd0 100644 --- a/lib/pear/Spreadsheet/Excel/Writer/Parser.php +++ b/lib/pear/Spreadsheet/Excel/Writer/Parser.php @@ -1206,7 +1206,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR default: // if it's a reference if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and - !preg_match("/[0-9]/",$this->_lookahead) and + !ereg("[0-9]",$this->_lookahead) and ($this->_lookahead != ':') and ($this->_lookahead != '.') and ($this->_lookahead != '!')) { @@ -1214,39 +1214,39 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR } // If it's an external reference (Sheet1!A1 or Sheet1:Sheet2!A1) elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z][0-9]+$/u",$token) and - !preg_match("/[0-9]/",$this->_lookahead) and + !ereg("[0-9]",$this->_lookahead) and ($this->_lookahead != ':') and ($this->_lookahead != '.')) { return $token; } // If it's an external reference ('Sheet1'!A1 or 'Sheet1:Sheet2'!A1) elseif (preg_match("/^'[\w -]+(\:[\w -]+)?'\![A-Ia-i]?[A-Za-z][0-9]+$/u",$token) and - !preg_match("/[0-9]/",$this->_lookahead) and + !ereg("[0-9]",$this->_lookahead) and ($this->_lookahead != ':') and ($this->_lookahead != '.')) { return $token; } // if it's a range (A1:A2) elseif (preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+:(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/",$token) and - !preg_match("/[0-9]/",$this->_lookahead)) + !ereg("[0-9]",$this->_lookahead)) { return $token; } // if it's a range (A1..A2) elseif (preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?[0-9]+$/",$token) and - !preg_match("/[0-9]/",$this->_lookahead)) + !ereg("[0-9]",$this->_lookahead)) { return $token; } // If it's an external range like Sheet1!A1 or Sheet1:Sheet2!A1:B2 elseif (preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$token) and - !preg_match("/[0-9]/",$this->_lookahead)) + !ereg("[0-9]",$this->_lookahead)) { return $token; } // If it's an external range like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1:B2 elseif (preg_match("/^'[\w -]+(\:[\w -]+)?'\!([A-Ia-i]?[A-Za-z])?[0-9]+:([A-Ia-i]?[A-Za-z])?[0-9]+$/u",$token) and - !preg_match("/[0-9]/",$this->_lookahead)) + !ereg("[0-9]",$this->_lookahead)) { return $token; } @@ -1258,12 +1258,12 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR return $token; } // If it's a string (of maximum 255 characters) - elseif (preg_match("/^\"[^\"]{0,255}\"$/",$token)) + elseif (ereg("^\"[^\"]{0,255}\"$",$token)) { return $token; } // if it's a function call - elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$token) and ($this->_lookahead == "(")) + elseif (eregi("^[A-Z0-9\xc0-\xdc\.]+$",$token) and ($this->_lookahead == "(")) { return $token; } @@ -1363,7 +1363,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR function _expression() { // If it's a string return a string node - if (preg_match("/^\"[^\"]{0,255}\"$/", $this->_current_token)) { + if (ereg("^\"[^\"]{0,255}\"$", $this->_current_token)) { $result = $this->_createTree($this->_current_token, '', ''); $this->_advance(); return $result; @@ -1521,7 +1521,7 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR return $result; } // if it's a function call - elseif (preg_match("/^[A-Z0-9\xc0-\xdc\.]+$/i",$this->_current_token)) + elseif (eregi("^[A-Z0-9\xc0-\xdc\.]+$",$this->_current_token)) { $result = $this->_func(); return $result; diff --git a/lib/soap/README_MOODLE.txt b/lib/soap/README_MOODLE.txt deleted file mode 100644 index a1fd9c0a313..00000000000 --- a/lib/soap/README_MOODLE.txt +++ /dev/null @@ -1,273 +0,0 @@ -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: nusoap.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/soap/nusoap.php,v -retrieving revision 1.2 -diff -u -r1.2 nusoap.php ---- nusoap.php 3 Jan 2007 14:44:42 -0000 1.2 -+++ nusoap.php 18 Nov 2009 06:48:29 -0000 -@@ -503,7 +503,7 @@ - case (is_array($val) || $type): - // detect if struct or array - $valueType = $this->isArraySimpleOrStruct($val); -- if($valueType=='arraySimple' || ereg('^ArrayOf',$type)){ -+ if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){ - $i = 0; - if(is_array($val) && count($val)> 0){ - foreach($val as $v){ -@@ -698,7 +698,7 @@ - */ - function expandQname($qname){ - // get element prefix -- if(strpos($qname,':') && !ereg('^http://',$qname)){ -+ if(strpos($qname,':') && !preg_match('#^http://#',$qname)){ - // get unqualified name - $name = substr(strstr($qname,':'),1); - // get ns prefix -@@ -827,6 +827,7 @@ - $datestr = date('Y-m-d\TH:i:sO',$timestamp); - if($utc){ - $eregStr = -+ '/'. - '([0-9]{4})-'. // centuries & years CCYY- - '([0-9]{2})-'. // months MM- - '([0-9]{2})'. // days DD -@@ -834,9 +835,10 @@ - '([0-9]{2}):'. // hours hh: - '([0-9]{2}):'. // minutes mm: - '([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss... -- '(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's -+ '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's -+ '/'; - -- if(ereg($eregStr,$datestr,$regs)){ -+ if(preg_match($eregStr,$datestr,$regs)){ - return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]); - } - return false; -@@ -853,6 +855,7 @@ - */ - function iso8601_to_timestamp($datestr){ - $eregStr = -+ '/'. - '([0-9]{4})-'. // centuries & years CCYY- - '([0-9]{2})-'. // months MM- - '([0-9]{2})'. // days DD -@@ -860,8 +863,9 @@ - '([0-9]{2}):'. // hours hh: - '([0-9]{2}):'. // minutes mm: - '([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss... -- '(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's -- if(ereg($eregStr,$datestr,$regs)){ -+ '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's -+ '/'; -+ if(preg_match($eregStr,$datestr,$regs)){ - // not utc - if($regs[8] != 'Z'){ - $op = substr($regs[8],0,1); -@@ -1171,7 +1175,7 @@ - if(count($attrs) > 0){ - foreach($attrs as $k => $v){ - // if ns declarations, add to class level array of valid namespaces -- if(ereg("^xmlns",$k)){ -+ if(preg_match("/^xmlns/",$k)){ - //$this->xdebug("$k: $v"); - //$this->xdebug('ns_prefix: '.$this->getPrefix($k)); - if($ns_prefix = substr(strrchr($k,':'),1)){ -@@ -1281,7 +1285,7 @@ - // minOccurs="0" maxOccurs="unbounded" /> - // - // -- if(isset($attrs['base']) && ereg(':Array$',$attrs['base'])){ -+ if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){ - $this->xdebug('complexType is unusual array'); - $this->complexTypes[$this->currentComplexType]['phpType'] = 'array'; - } else { -@@ -1300,7 +1304,7 @@ - // minOccurs="0" maxOccurs="unbounded" /> - // - // -- if(isset($attrs['base']) && ereg(':Array$',$attrs['base'])){ -+ if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){ - $this->xdebug('complexType is unusual array'); - $this->complexTypes[$this->currentComplexType]['phpType'] = 'array'; - } else { -@@ -1698,7 +1702,7 @@ - } elseif(isset($this->attributes[$type])){ - $this->xdebug("in getTypeDef, found attribute $type"); - return $this->attributes[$type]; -- } elseif (ereg('_ContainedType$', $type)) { -+ } elseif (preg_match('/_ContainedType$/', $type)) { - $this->xdebug("in getTypeDef, have an untyped element $type"); - $typeDef['typeClass'] = 'simpleType'; - $typeDef['phpType'] = 'scalar'; -@@ -2041,7 +2045,7 @@ - function soap_transport_http($url){ - parent::nusoap_base(); - $this->setURL($url); -- ereg('\$Revisio' . 'n: ([^ ]+)', $this->revision, $rev); -+ preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev); - $this->outgoing_headers['User-Agent'] = $this->title.'/'.$this->version.' ('.$rev[1].')'; - $this->debug('set User-Agent: ' . $this->outgoing_headers['User-Agent']); - } -@@ -2580,7 +2584,7 @@ - } - } - // remove 100 header -- if(isset($lb) && ereg('^HTTP/1.1 100',$data)){ -+ if(isset($lb) && preg_match('/^HTTP/1.1 100/',$data)){ - unset($lb); - $data = ''; - }// -@@ -2733,7 +2737,7 @@ - curl_close($this->ch); - - // remove 100 header(s) -- while (ereg('^HTTP/1.1 100',$data)) { -+ while (preg_match('#^HTTP/1.1 100#',$data)) { - if ($pos = strpos($data,"\r\n\r\n")) { - $data = ltrim(substr($data,$pos)); - } elseif($pos = strpos($data,"\n\n") ) { -@@ -3267,7 +3271,7 @@ - } - $this->debug("In service, query string=$qs"); - -- if (ereg('wsdl', $qs) ){ -+ if (preg_match('/wsdl/', $qs) ){ - $this->debug("In service, this is a request for WSDL"); - if($this->externalWSDLURL){ - if (strpos($this->externalWSDLURL,"://")!==false) { // assume URL -@@ -3338,7 +3342,7 @@ - // get the character encoding of the incoming request - if(isset($this->headers['content-type']) && strpos($this->headers['content-type'],'=')){ - $enc = str_replace('"','',substr(strstr($this->headers["content-type"],'='),1)); -- if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){ -+ if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){ - $this->xml_encoding = strtoupper($enc); - } else { - $this->xml_encoding = 'US-ASCII'; -@@ -3367,7 +3371,7 @@ - $enc = substr(strstr($v, '='), 1); - $enc = str_replace('"', '', $enc); - $enc = str_replace('\\', '', $enc); -- if (eregi('^(ISO-8859-1|US-ASCII|UTF-8)$', $enc)) { -+ if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) { - $this->xml_encoding = strtoupper($enc); - } else { - $this->xml_encoding = 'US-ASCII'; -@@ -3401,7 +3405,7 @@ - $enc = substr(strstr($v, '='), 1); - $enc = str_replace('"', '', $enc); - $enc = str_replace('\\', '', $enc); -- if (eregi('^(ISO-8859-1|US-ASCII|UTF-8)$', $enc)) { -+ if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) { - $this->xml_encoding = strtoupper($enc); - } else { - $this->xml_encoding = 'US-ASCII'; -@@ -3730,7 +3734,7 @@ - $payload .= $this->getDebugAsXMLComment(); - } - $this->outgoing_headers[] = "Server: $this->title Server v$this->version"; -- ereg('\$Revisio' . 'n: ([^ ]+)', $this->revision, $rev); -+ preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev); - $this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")"; - // Let the Web server decide about this - //$this->outgoing_headers[] = "Connection: Close\r\n"; -@@ -3818,7 +3822,7 @@ - if (strpos($headers['content-type'], '=')) { - $enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1)); - $this->debug('Got response encoding: ' . $enc); -- if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){ -+ if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){ - $this->xml_encoding = strtoupper($enc); - } else { - $this->xml_encoding = 'US-ASCII'; -@@ -4336,7 +4340,7 @@ - $this->currentSchema->schemaStartElement($parser, $name, $attrs); - $this->appendDebug($this->currentSchema->getDebug()); - $this->currentSchema->clearDebug(); -- } elseif (ereg('schema$', $name)) { -+ } elseif (preg_match('/schema$/', $name)) { - $this->debug('Parsing WSDL schema'); - // $this->debug("startElement for $name ($attrs[name]). status = $this->status (".$this->getLocalPart($name).")"); - $this->status = 'schema'; -@@ -4355,7 +4359,7 @@ - if (count($attrs) > 0) { - // register namespace declarations - foreach($attrs as $k => $v) { -- if (ereg("^xmlns", $k)) { -+ if (preg_match("/^xmlns/", $k)) { - if ($ns_prefix = substr(strrchr($k, ':'), 1)) { - $this->namespaces[$ns_prefix] = $v; - } else { -@@ -4380,7 +4384,7 @@ - $attrs = array(); - } - // get element prefix, namespace and name -- if (ereg(':', $name)) { -+ if (preg_match('/:/', $name)) { - // get ns prefix - $prefix = substr($name, 0, strpos($name, ':')); - // get ns -@@ -4545,7 +4549,7 @@ - */ - function end_element($parser, $name){ - // unset schema status -- if (/*ereg('types$', $name) ||*/ ereg('schema$', $name)) { -+ if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) { - $this->status = ""; - $this->appendDebug($this->currentSchema->getDebug()); - $this->currentSchema->clearDebug(); -@@ -5995,7 +5999,7 @@ - $key_localpart = $this->getLocalPart($key); - // if ns declarations, add to class level array of valid namespaces - if($key_prefix == 'xmlns'){ -- if(ereg('^http://www.w3.org/[0-9]{4}/XMLSchema$',$value)){ -+ if(preg_match('#^http://www.w3.org/[0-9]{4}/XMLSchema$#',$value)){ - $this->XMLSchemaVersion = $value; - $this->namespaces['xsd'] = $this->XMLSchemaVersion; - $this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance'; -@@ -6031,8 +6035,8 @@ - [5] length ::= nextDimension* Digit+ - [6] nextDimension ::= Digit+ ',' - */ -- $expr = '([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]'; -- if(ereg($expr,$value,$regs)){ -+ $expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]'; -+ if(preg_match($expr,$value,$regs)){ - $this->message[$pos]['typePrefix'] = $regs[1]; - $this->message[$pos]['arrayTypePrefix'] = $regs[1]; - if (isset($this->namespaces[$regs[1]])) { -@@ -6758,7 +6762,7 @@ - // detect transport - switch(true){ - // http(s) -- case ereg('^http',$this->endpoint): -+ case preg_match('/^http/',$this->endpoint): - $this->debug('transporting via HTTP'); - if($this->persistentConnection == true && is_object($this->persistentConnection)){ - $http =& $this->persistentConnection; -@@ -6780,10 +6784,10 @@ - $http->setEncoding($this->http_encoding); - } - $this->debug('sending message, length='.strlen($msg)); -- if(ereg('^http:',$this->endpoint)){ -+ if(preg_match('/^http:/',$this->endpoint)){ - //if(strpos($this->endpoint,'http:')){ - $this->responseData = $http->send($msg,$timeout,$response_timeout,$this->cookies); -- } elseif(ereg('^https',$this->endpoint)){ -+ } elseif(preg_match('/^https/',$this->endpoint)){ - //} elseif(strpos($this->endpoint,'https:')){ - //if(phpversion() == '4.3.0-dev'){ - //$response = $http->send($msg,$timeout,$response_timeout); -@@ -6841,7 +6845,7 @@ - if (strpos($headers['content-type'], '=')) { - $enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1)); - $this->debug('Got response encoding: ' . $enc); -- if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){ -+ if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){ - $this->xml_encoding = strtoupper($enc); - } else { - $this->xml_encoding = 'US-ASCII'; diff --git a/lib/soap/nusoap.php b/lib/soap/nusoap.php index 68b184b5689..d7ad5d71425 100644 --- a/lib/soap/nusoap.php +++ b/lib/soap/nusoap.php @@ -503,7 +503,7 @@ class nusoap_base { case (is_array($val) || $type): // detect if struct or array $valueType = $this->isArraySimpleOrStruct($val); - if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){ + if($valueType=='arraySimple' || ereg('^ArrayOf',$type)){ $i = 0; if(is_array($val) && count($val)> 0){ foreach($val as $v){ @@ -698,7 +698,7 @@ class nusoap_base { */ function expandQname($qname){ // get element prefix - if(strpos($qname,':') && !preg_match('#^http://#',$qname)){ + if(strpos($qname,':') && !ereg('^http://',$qname)){ // get unqualified name $name = substr(strstr($qname,':'),1); // get ns prefix @@ -827,7 +827,6 @@ function timestamp_to_iso8601($timestamp,$utc=true){ $datestr = date('Y-m-d\TH:i:sO',$timestamp); if($utc){ $eregStr = - '/'. '([0-9]{4})-'. // centuries & years CCYY- '([0-9]{2})-'. // months MM- '([0-9]{2})'. // days DD @@ -835,10 +834,9 @@ function timestamp_to_iso8601($timestamp,$utc=true){ '([0-9]{2}):'. // hours hh: '([0-9]{2}):'. // minutes mm: '([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss... - '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's - '/'; + '(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's - if(preg_match($eregStr,$datestr,$regs)){ + if(ereg($eregStr,$datestr,$regs)){ return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]); } return false; @@ -855,7 +853,6 @@ function timestamp_to_iso8601($timestamp,$utc=true){ */ function iso8601_to_timestamp($datestr){ $eregStr = - '/'. '([0-9]{4})-'. // centuries & years CCYY- '([0-9]{2})-'. // months MM- '([0-9]{2})'. // days DD @@ -863,9 +860,8 @@ function iso8601_to_timestamp($datestr){ '([0-9]{2}):'. // hours hh: '([0-9]{2}):'. // minutes mm: '([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss... - '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's - '/'; - if(preg_match($eregStr,$datestr,$regs)){ + '(Z|[+\-][0-9]{2}:?[0-9]{2})?'; // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's + if(ereg($eregStr,$datestr,$regs)){ // not utc if($regs[8] != 'Z'){ $op = substr($regs[8],0,1); @@ -1175,7 +1171,7 @@ class XMLSchema extends nusoap_base { if(count($attrs) > 0){ foreach($attrs as $k => $v){ // if ns declarations, add to class level array of valid namespaces - if(preg_match("/^xmlns/",$k)){ + if(ereg("^xmlns",$k)){ //$this->xdebug("$k: $v"); //$this->xdebug('ns_prefix: '.$this->getPrefix($k)); if($ns_prefix = substr(strrchr($k,':'),1)){ @@ -1285,7 +1281,7 @@ class XMLSchema extends nusoap_base { // minOccurs="0" maxOccurs="unbounded" /> // // - if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){ + if(isset($attrs['base']) && ereg(':Array$',$attrs['base'])){ $this->xdebug('complexType is unusual array'); $this->complexTypes[$this->currentComplexType]['phpType'] = 'array'; } else { @@ -1304,7 +1300,7 @@ class XMLSchema extends nusoap_base { // minOccurs="0" maxOccurs="unbounded" /> // // - if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){ + if(isset($attrs['base']) && ereg(':Array$',$attrs['base'])){ $this->xdebug('complexType is unusual array'); $this->complexTypes[$this->currentComplexType]['phpType'] = 'array'; } else { @@ -1702,7 +1698,7 @@ class XMLSchema extends nusoap_base { } elseif(isset($this->attributes[$type])){ $this->xdebug("in getTypeDef, found attribute $type"); return $this->attributes[$type]; - } elseif (preg_match('/_ContainedType$/', $type)) { + } elseif (ereg('_ContainedType$', $type)) { $this->xdebug("in getTypeDef, have an untyped element $type"); $typeDef['typeClass'] = 'simpleType'; $typeDef['phpType'] = 'scalar'; @@ -2045,7 +2041,7 @@ class soap_transport_http extends nusoap_base { function soap_transport_http($url){ parent::nusoap_base(); $this->setURL($url); - preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev); + ereg('\$Revisio' . 'n: ([^ ]+)', $this->revision, $rev); $this->outgoing_headers['User-Agent'] = $this->title.'/'.$this->version.' ('.$rev[1].')'; $this->debug('set User-Agent: ' . $this->outgoing_headers['User-Agent']); } @@ -2584,7 +2580,7 @@ class soap_transport_http extends nusoap_base { } } // remove 100 header - if(isset($lb) && preg_match('/^HTTP/1.1 100/',$data)){ + if(isset($lb) && ereg('^HTTP/1.1 100',$data)){ unset($lb); $data = ''; }// @@ -2737,7 +2733,7 @@ class soap_transport_http extends nusoap_base { curl_close($this->ch); // remove 100 header(s) - while (preg_match('#^HTTP/1.1 100#',$data)) { + while (ereg('^HTTP/1.1 100',$data)) { if ($pos = strpos($data,"\r\n\r\n")) { $data = ltrim(substr($data,$pos)); } elseif($pos = strpos($data,"\n\n") ) { @@ -3271,7 +3267,7 @@ class soap_server extends nusoap_base { } $this->debug("In service, query string=$qs"); - if (preg_match('/wsdl/', $qs) ){ + if (ereg('wsdl', $qs) ){ $this->debug("In service, this is a request for WSDL"); if($this->externalWSDLURL){ if (strpos($this->externalWSDLURL,"://")!==false) { // assume URL @@ -3342,7 +3338,7 @@ class soap_server extends nusoap_base { // get the character encoding of the incoming request if(isset($this->headers['content-type']) && strpos($this->headers['content-type'],'=')){ $enc = str_replace('"','',substr(strstr($this->headers["content-type"],'='),1)); - if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){ + if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){ $this->xml_encoding = strtoupper($enc); } else { $this->xml_encoding = 'US-ASCII'; @@ -3371,7 +3367,7 @@ class soap_server extends nusoap_base { $enc = substr(strstr($v, '='), 1); $enc = str_replace('"', '', $enc); $enc = str_replace('\\', '', $enc); - if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) { + if (eregi('^(ISO-8859-1|US-ASCII|UTF-8)$', $enc)) { $this->xml_encoding = strtoupper($enc); } else { $this->xml_encoding = 'US-ASCII'; @@ -3405,7 +3401,7 @@ class soap_server extends nusoap_base { $enc = substr(strstr($v, '='), 1); $enc = str_replace('"', '', $enc); $enc = str_replace('\\', '', $enc); - if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) { + if (eregi('^(ISO-8859-1|US-ASCII|UTF-8)$', $enc)) { $this->xml_encoding = strtoupper($enc); } else { $this->xml_encoding = 'US-ASCII'; @@ -3734,7 +3730,7 @@ class soap_server extends nusoap_base { $payload .= $this->getDebugAsXMLComment(); } $this->outgoing_headers[] = "Server: $this->title Server v$this->version"; - preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev); + ereg('\$Revisio' . 'n: ([^ ]+)', $this->revision, $rev); $this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")"; // Let the Web server decide about this //$this->outgoing_headers[] = "Connection: Close\r\n"; @@ -3822,7 +3818,7 @@ class soap_server extends nusoap_base { if (strpos($headers['content-type'], '=')) { $enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1)); $this->debug('Got response encoding: ' . $enc); - if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){ + if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){ $this->xml_encoding = strtoupper($enc); } else { $this->xml_encoding = 'US-ASCII'; @@ -4340,7 +4336,7 @@ class wsdl extends nusoap_base { $this->currentSchema->schemaStartElement($parser, $name, $attrs); $this->appendDebug($this->currentSchema->getDebug()); $this->currentSchema->clearDebug(); - } elseif (preg_match('/schema$/', $name)) { + } elseif (ereg('schema$', $name)) { $this->debug('Parsing WSDL schema'); // $this->debug("startElement for $name ($attrs[name]). status = $this->status (".$this->getLocalPart($name).")"); $this->status = 'schema'; @@ -4359,7 +4355,7 @@ class wsdl extends nusoap_base { if (count($attrs) > 0) { // register namespace declarations foreach($attrs as $k => $v) { - if (preg_match("/^xmlns/", $k)) { + if (ereg("^xmlns", $k)) { if ($ns_prefix = substr(strrchr($k, ':'), 1)) { $this->namespaces[$ns_prefix] = $v; } else { @@ -4384,7 +4380,7 @@ class wsdl extends nusoap_base { $attrs = array(); } // get element prefix, namespace and name - if (preg_match('/:/', $name)) { + if (ereg(':', $name)) { // get ns prefix $prefix = substr($name, 0, strpos($name, ':')); // get ns @@ -4549,7 +4545,7 @@ class wsdl extends nusoap_base { */ function end_element($parser, $name){ // unset schema status - if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) { + if (/*ereg('types$', $name) ||*/ ereg('schema$', $name)) { $this->status = ""; $this->appendDebug($this->currentSchema->getDebug()); $this->currentSchema->clearDebug(); @@ -5999,7 +5995,7 @@ class soap_parser extends nusoap_base { $key_localpart = $this->getLocalPart($key); // if ns declarations, add to class level array of valid namespaces if($key_prefix == 'xmlns'){ - if(preg_match('#^http://www.w3.org/[0-9]{4}/XMLSchema$#',$value)){ + if(ereg('^http://www.w3.org/[0-9]{4}/XMLSchema$',$value)){ $this->XMLSchemaVersion = $value; $this->namespaces['xsd'] = $this->XMLSchemaVersion; $this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance'; @@ -6035,8 +6031,8 @@ class soap_parser extends nusoap_base { [5] length ::= nextDimension* Digit+ [6] nextDimension ::= Digit+ ',' */ - $expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]'; - if(preg_match($expr,$value,$regs)){ + $expr = '([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]'; + if(ereg($expr,$value,$regs)){ $this->message[$pos]['typePrefix'] = $regs[1]; $this->message[$pos]['arrayTypePrefix'] = $regs[1]; if (isset($this->namespaces[$regs[1]])) { @@ -6762,7 +6758,7 @@ class soap_client extends nusoap_base { // detect transport switch(true){ // http(s) - case preg_match('/^http/',$this->endpoint): + case ereg('^http',$this->endpoint): $this->debug('transporting via HTTP'); if($this->persistentConnection == true && is_object($this->persistentConnection)){ $http =& $this->persistentConnection; @@ -6784,10 +6780,10 @@ class soap_client extends nusoap_base { $http->setEncoding($this->http_encoding); } $this->debug('sending message, length='.strlen($msg)); - if(preg_match('/^http:/',$this->endpoint)){ + if(ereg('^http:',$this->endpoint)){ //if(strpos($this->endpoint,'http:')){ $this->responseData = $http->send($msg,$timeout,$response_timeout,$this->cookies); - } elseif(preg_match('/^https/',$this->endpoint)){ + } elseif(ereg('^https',$this->endpoint)){ //} elseif(strpos($this->endpoint,'https:')){ //if(phpversion() == '4.3.0-dev'){ //$response = $http->send($msg,$timeout,$response_timeout); @@ -6845,7 +6841,7 @@ class soap_client extends nusoap_base { if (strpos($headers['content-type'], '=')) { $enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1)); $this->debug('Got response encoding: ' . $enc); - if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){ + if(eregi('^(ISO-8859-1|US-ASCII|UTF-8)$',$enc)){ $this->xml_encoding = strtoupper($enc); } else { $this->xml_encoding = 'US-ASCII'; diff --git a/lib/tcpdf/README_MOODLE.txt b/lib/tcpdf/README_MOODLE.txt deleted file mode 100644 index 883654c5272..00000000000 --- a/lib/tcpdf/README_MOODLE.txt +++ /dev/null @@ -1,26 +0,0 @@ -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: html2pdf.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/tcpdf/Attic/html2pdf.php,v -retrieving revision 1.1 -diff -u -r1.1 html2pdf.php ---- html2pdf.php 2 Feb 2007 18:38:05 -0000 1.1 -+++ html2pdf.php 18 Nov 2009 06:51:34 -0000 -@@ -1,5 +1,5 @@ - OpenTag($tag,$attr); - } diff --git a/lib/tcpdf/html2pdf.php b/lib/tcpdf/html2pdf.php index 385fe2ed3c1..acfecb11c4f 100644 --- a/lib/tcpdf/html2pdf.php +++ b/lib/tcpdf/html2pdf.php @@ -1,5 +1,5 @@ OpenTag($tag,$attr); } diff --git a/lib/typo3/README_MOODLE.txt b/lib/typo3/README_MOODLE.txt deleted file mode 100644 index 80461d7f9d7..00000000000 --- a/lib/typo3/README_MOODLE.txt +++ /dev/null @@ -1,359 +0,0 @@ -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: class.t3lib_cs.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/typo3/class.t3lib_cs.php,v -retrieving revision 1.7 -diff -u -r1.7 class.t3lib_cs.php ---- class.t3lib_cs.php 11 Aug 2006 09:48:35 -0000 1.7 -+++ class.t3lib_cs.php 18 Nov 2009 06:53:50 -0000 -@@ -781,8 +781,8 @@ - $trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES)); // Getting them in iso-8859-1 - but thats ok since this is observed below. - } - -- $token = md5(microtime()); -- $parts = explode($token,ereg_replace('(&([#[:alnum:]]*);)',$token.'\2'.$token,$str)); -+ $token = 'a'.md5(microtime());//token must start with a letter or preg_replace substitution won't work -+ $parts = explode($token,preg_replace('/(&([#[:alnum:]]*);)/',$token.'\2'.$token,$str)); - foreach($parts as $k => $v) { - if ($k%2) { - if (substr($v,0,1)=='#') { // Dec or hex entities: -@@ -974,13 +974,13 @@ - - // Detect type if not done yet: (Done on first real line) - // The "whitespaced" type is on the syntax "0x0A 0x000A #LINE FEED" while "ms-token" is like "B9 = U+00B9 : SUPERSCRIPT ONE" -- if (!$detectedType) $detectedType = ereg('[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+',$value) ? 'whitespaced' : 'ms-token'; -+ if (!$detectedType) $detectedType = preg_match('/[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+/',$value) ? 'whitespaced' : 'ms-token'; - - if ($detectedType=='ms-token') { - list($hexbyte,$utf8) = split('=|:',$value,3); - } elseif ($detectedType=='whitespaced') { - $regA=array(); -- ereg('[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+',$value,$regA); -+ preg_match('/[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+/',$value,$regA); - $hexbyte = $regA[1]; - $utf8 = 'U+'.$regA[2]; - } -@@ -1084,7 +1084,7 @@ - - // accented Latin letters without "official" decomposition - $match = array(); -- if (ereg('^LATIN (SMALL|CAPITAL) LETTER ([A-Z]) WITH',$name,$match) && !$decomp) { -+ if (preg_match('/^LATIN (SMALL|CAPITAL) LETTER ([A-Z]) WITH/',$name,$match) && !$decomp) { - $c = ord($match[2]); - if ($match[1] == 'SMALL') $c += 32; - -@@ -1093,7 +1093,7 @@ - } - - $match = array(); -- if (ereg('(<.*>)? *(.+)',$decomp,$match)) { -+ if (preg_match('/(<.*>)? *(.+)/',$decomp,$match)) { - switch($match[1]) { - case '': // add parenthesis as circle replacement, eg (1) - $match[2] = '0028 '.$match[2].' 0029'; -@@ -1104,7 +1104,7 @@ - break; - - case '': // ignore multi char decompositions that start with a space -- if (ereg('^0020 ',$match[2])) continue 2; -+ if (preg_match('/^0020 /',$match[2])) continue 2; - break; - - // ignore Arabic and vertical layout presentation decomposition -Index: class.t3lib_div.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/typo3/class.t3lib_div.php,v -retrieving revision 1.2 -diff -u -r1.2 class.t3lib_div.php ---- class.t3lib_div.php 17 Oct 2005 15:48:29 -0000 1.2 -+++ class.t3lib_div.php 18 Nov 2009 06:53:51 -0000 -@@ -798,7 +798,7 @@ - * @return array Contains keys [path], [file], [filebody], [fileext], [realFileext] - */ - function split_fileref($fileref) { -- if ( ereg('(.*/)(.*)$',$fileref,$reg) ) { -+ if ( preg_match('#(.*/)(.*)$#',$fileref,$reg) ) { - $info['path'] = $reg[1]; - $info['file'] = $reg[2]; - } else { -@@ -806,7 +806,7 @@ - $info['file'] = $fileref; - } - $reg=''; -- if ( ereg('(.*)\.([^\.]*$)',$info['file'],$reg) ) { -+ if ( preg_match('/(.*)\.([^\.]*$)/',$info['file'],$reg) ) { - $info['filebody'] = $reg[1]; - $info['fileext'] = strtolower($reg[2]); - $info['realFileext'] = $reg[2]; -@@ -882,7 +882,7 @@ - * @return string - */ - function rm_endcomma($string) { -- return ereg_replace(',$','',$string); -+ return preg_replace('/,$/','',$string); - } - - /** -@@ -896,7 +896,7 @@ - */ - function danish_strtoupper($string) { - $value = strtoupper($string); -- return strtr($value, 'áéúíâêûôîæøåäöü', 'ÁÉÚÍÄËÜÖÏÆØÅÄÖÜ'); -+ return strtr($value, 'ￜￜￜￜￜￜￜￜￜￜￜￜￜￜￜ', 'ￜￜￜￜￜￜￜￜￜￜￜￜￜￜￜ'); - } - - /** -@@ -904,13 +904,13 @@ - * Only known characters will be converted, so don't expect a result for any character. - * (DEPRECIATED: Works only for western europe single-byte charsets! Use t3lib_cs::specCharsToASCII() instead!) - * -- * ä => ae, Ö => Oe -+ * ï¿œ => ae, ï¿œ => Oe - * - * @param string String to convert. - * @return string - */ - function convUmlauts($str) { -- $pat = array ( '/ä/', '/Ä/', '/ö/', '/Ö/', '/ü/', '/Ü/', '/ß/', '/å/', '/Å/', '/ø/', '/Ø/', '/æ/', '/Æ/' ); -+ $pat = array ( '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/', '/ï¿œ/' ); - $repl = array ( 'ae', 'Ae', 'oe', 'Oe', 'ue', 'Ue', 'ss', 'aa', 'AA', 'oe', 'OE', 'ae', 'AE' ); - return preg_replace($pat,$repl,$str); - } -@@ -1022,7 +1022,7 @@ - * @see calcParenthesis() - */ - function calcPriority($string) { -- $string=ereg_replace('[[:space:]]*','',$string); // removing all whitespace -+ $string=preg_replace('/[ ]*/','',$string); // removing all whitespace - $string='+'.$string; // Ensuring an operator for the first entrance - $qm='\*\/\+-^%'; - $regex = '(['.$qm.'])(['.$qm.']?[0-9\.]*)'; -@@ -1103,7 +1103,7 @@ - * @return string Converted result. - */ - function deHSCentities($str) { -- return ereg_replace('&([#[:alnum:]]*;)','&\1',$str); -+ return preg_replace('/&([#A-Za-z0-9]*;)/','&\1',$str); - } - - /** -@@ -1154,7 +1154,7 @@ - function validEmail($email) { - $email = trim ($email); - if (strstr($email,' ')) return FALSE; -- return ereg('^[A-Za-z0-9\._-]+[@][A-Za-z0-9\._-]+[\.].[A-Za-z0-9]+$',$email) ? TRUE : FALSE; -+ return preg_match('/^[A-Za-z0-9\._-]+[@][A-Za-z0-9\._-]+[\.].[A-Za-z0-9]+$/',$email) ? TRUE : FALSE; - } - - /** -@@ -1555,7 +1555,7 @@ - $name = ''; - } - } else { -- if ($key = strtolower(ereg_replace('[^a-zA-Z0-9]','',$val))) { -+ if ($key = strtolower(preg_replace('/[^a-zA-Z0-9]/','',$val))) { - $attributes[$key] = ''; - $name = $key; - } -@@ -1580,9 +1580,9 @@ - * @internal - */ - function split_tag_attributes($tag) { -- $tag_tmp = trim(eregi_replace ('^<[^[:space:]]*','',trim($tag))); -+ $tag_tmp = trim(preg_replace ('/^<[^[:space:]]*/i','',trim($tag))); - // Removes any > in the end of the string -- $tag_tmp = trim(eregi_replace ('>$','',$tag_tmp)); -+ $tag_tmp = trim(preg_replace ('/>$/i','',$tag_tmp)); - - while (strcmp($tag_tmp,'')) { // Compared with empty string instead , 030102 - $firstChar=substr($tag_tmp,0,1); -@@ -1653,7 +1653,7 @@ - * @param boolean Wrap script element in linebreaks? Default is TRUE. - * @return string The wrapped JS code, ready to put into a XHTML page - * @author Ingmar Schlecht -- * @author René Fritz -+ * @author Renï¿œ Fritz - */ - function wrapJS($string, $linebreak=TRUE) { - if(trim($string)) { -@@ -1813,7 +1813,7 @@ - } - - // The tag name is cleaned up so only alphanumeric chars (plus - and _) are in there and not longer than 100 chars either. -- $tagName = substr(ereg_replace('[^[:alnum:]_-]','',$tagName),0,100); -+ $tagName = substr(preg_replace('/[^[:alnum:]_-]/','',$tagName),0,100); - - // If the value is an array then we will call this function recursively: - if (is_array($v)) { -@@ -1902,7 +1902,7 @@ - // What we do here fixes the problem but ONLY if the charset is utf-8, iso-8859-1 or us-ascii. That should work for most TYPO3 installations, in particular if people use utf-8 which we highly recommend. - if ((double)phpversion()>=5) { - unset($ereg_result); -- ereg('^[[:space:]]*<\?xml[^>]*encoding[[:space:]]*=[[:space:]]*"([^"]*)"',substr($string,0,200),$ereg_result); -+ preg_match('/^[[:space:]]*<\?xml[^>]*encoding[[:space:]]*=[[:space:]]*"([^"]*)"/',substr($string,0,200),$ereg_result); - $theCharset = $ereg_result[1] ? $ereg_result[1] : ($TYPO3_CONF_VARS['BE']['forceCharset'] ? $TYPO3_CONF_VARS['BE']['forceCharset'] : 'iso-8859-1'); - xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $theCharset); // us-ascii / utf-8 / iso-8859-1 - } -@@ -2042,7 +2042,7 @@ - function xmlGetHeaderAttribs($xmlData) { - $xmlHeader = substr(trim($xmlData),0,200); - $reg=array(); -- if (eregi('^<\?xml([^>]*)\?\>',$xmlHeader,$reg)) { -+ if (preg_match('/^<\?xml([^>]*)\?\>/i',$xmlHeader,$reg)) { - return t3lib_div::get_tag_attributes($reg[1]); - } - } -@@ -2163,7 +2163,7 @@ - // Checking if the "subdir" is found: - $subdir = substr($fI['dirname'],strlen($dirName)); - if ($subdir) { -- if (ereg('^[[:alnum:]_]+\/$',$subdir)) { -+ if (preg_match('#^[[:alnum:]_]+\/$#',$subdir)) { - $dirName.= $subdir; - if (!@is_dir($dirName)) { - t3lib_div::mkdir($dirName); -@@ -2191,7 +2191,7 @@ - * @return boolean TRUE if @mkdir went well! - */ - function mkdir($theNewFolder) { -- $theNewFolder = ereg_replace('\/$','',$theNewFolder); -+ $theNewFolder = preg_replace('#\/$#','',$theNewFolder); - if (mkdir($theNewFolder, octdec($GLOBALS['TYPO3_CONF_VARS']['BE']['folderCreateMask']))){ - chmod($theNewFolder, octdec($GLOBALS['TYPO3_CONF_VARS']['BE']['folderCreateMask'])); //added this line, because the mode at 'mkdir' has a strange behaviour sometimes - -@@ -2240,7 +2240,7 @@ - // Initialize variabels: - $filearray = array(); - $sortarray = array(); -- $path = ereg_replace('\/$','',$path); -+ $path = preg_replace('#\/$#','',$path); - - // Find files+directories: - if (@is_dir($path)) { -@@ -2564,7 +2564,7 @@ - - $pString = t3lib_div::implodeArrayForUrl('',$params); - -- return $pString ? $parts.'?'.ereg_replace('^&','',$pString) : $parts; -+ return $pString ? $parts.'?'.preg_replace('/^&/','',$pString) : $parts; - } - - /** -@@ -2673,7 +2673,7 @@ - case 'REQUEST_URI': - // Typical application of REQUEST_URI is return urls, forms submitting to itself etc. Example: returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')) - if (!$_SERVER['REQUEST_URI']) { // This is for ISS/CGI which does not have the REQUEST_URI available. -- return '/'.ereg_replace('^/','',t3lib_div::getIndpEnv('SCRIPT_NAME')). -+ return '/'.preg_replace('#^/#','',t3lib_div::getIndpEnv('SCRIPT_NAME')). - ($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING']:''); - } else return $_SERVER['REQUEST_URI']; - break; -@@ -2826,11 +2826,11 @@ - break; - case 'msie': - $tmp = strstr($useragent,'MSIE'); -- $bInfo['VERSION'] = doubleval(ereg_replace('^[^0-9]*','',substr($tmp,4))); -+ $bInfo['VERSION'] = doubleval(preg_replace('/^[^0-9]*/','',substr($tmp,4))); - break; - case 'opera': - $tmp = strstr($useragent,'Opera'); -- $bInfo['VERSION'] = doubleval(ereg_replace('^[^0-9]*','',substr($tmp,5))); -+ $bInfo['VERSION'] = doubleval(preg_replace('/^[^0-9]*/','',substr($tmp,5))); - break; - case 'konqu': - $tmp = strstr($useragent,'Konqueror/'); -@@ -2966,7 +2966,7 @@ - */ - function verifyFilenameAgainstDenyPattern($filename) { - if (strcmp($filename,'') && strcmp($GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern'],'')) { -- $result = eregi($GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern'],$filename); -+ $result = preg_match('/'.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern'].'/i',$filename); - if ($result) return false; // so if a matching filename is found, return false; - } - return true; -@@ -3126,7 +3126,7 @@ - function readLLfile($fileRef,$langKey) { - $file = t3lib_div::getFileAbsFileName($fileRef); - if ($file) { -- $baseFile = ereg_replace('\.(php|xml)$', '', $file); -+ $baseFile = preg_replace('#\.(php|xml)$#', '', $file); - - if (@is_file($baseFile.'.xml')) { - $LOCAL_LANG = t3lib_div::readLLXMLfile($baseFile.'.xml', $langKey); -@@ -3162,7 +3162,7 @@ - // Cache file name: - $hashSource = substr($fileRef,strlen(PATH_site)).'|'.date('d-m-Y H:i:s',filemtime($fileRef)); - $cacheFileName = PATH_site.'typo3temp/llxml/'. -- #str_replace('_','',ereg_replace('^.*\/','',dirname($fileRef))). -+ #str_replace('_','',preg_replace('#^.*\/#','',dirname($fileRef))). - #'_'.basename($fileRef). - substr(basename($fileRef),10,15). - '_'.t3lib_div::shortMD5($hashSource).'.'.$langKey.'.'.$origCharset.'.cache'; -@@ -3344,7 +3344,7 @@ - - // Check persistent object and if found, call directly and exit. - if (is_array($GLOBALS['T3_VAR']['callUserFunction'][$funcName])) { -- return call_user_method( -+ return call_user_func( - $GLOBALS['T3_VAR']['callUserFunction'][$funcName]['method'], - $GLOBALS['T3_VAR']['callUserFunction'][$funcName]['obj'], - $params, -@@ -3405,7 +3405,7 @@ - ); - } - // Call method: -- $content = call_user_method( -+ $content = call_user_func( - $parts[1], - $classObj, - $params, -@@ -3520,7 +3520,7 @@ - * @param string Sub type like file extensions or similar. Defined by the service. - * @param mixed List of service keys which should be exluded in the search for a service. Array or comma list. - * @return object The service object or an array with error info's. -- * @author René Fritz -+ * @author Renï¿œ Fritz - */ - function &makeInstanceService($serviceType, $serviceSubType='', $excludeServiceKeys=array()) { - global $T3_SERVICES, $T3_VAR, $TYPO3_CONF_VARS; -@@ -3606,7 +3606,7 @@ - - $message=t3lib_div::quoted_printable($message); - -- if (!$dontEncodeSubject) $subject='=?'.$charset.'?Q?'.trim(t3lib_div::quoted_printable(ereg_replace('[[:space:]]','_',$subject),1000)).'?='; -+ if (!$dontEncodeSubject) $subject='=?'.$charset.'?Q?'.trim(t3lib_div::quoted_printable(preg_replace('#/[[:space:]]/#','_',$subject),1000)).'?='; - break; - case '8bit': - $headers=trim($headers).chr(10). -@@ -3657,11 +3657,11 @@ - $len+=3; - } - } -- $newVal = ereg_replace(chr(32).'$','=20',$newVal); // Replaces a possible SPACE-character at the end of a line -- $newVal = ereg_replace(chr(9).'$','=09',$newVal); // Replaces a possible TAB-character at the end of a line -+ $newVal = preg_replace('/'.chr(32).'$/','=20',$newVal); // Replaces a possible SPACE-character at the end of a line -+ $newVal = preg_replace('/'.chr(9).'$/','=09',$newVal); // Replaces a possible TAB-character at the end of a line - $newString.=$newVal.chr(13).chr(10); - } -- return ereg_replace(chr(13).chr(10).'$','',$newString); -+ return preg_replace('/'.chr(13).chr(10).'$/','',$newString); - } - - /** -@@ -3853,12 +3853,12 @@ - if($quoteActive > -1) { - $paramsArr[$quoteActive] .= ' '.$v; - unset($paramsArr[$k]); -- if(ereg('"$', $v)) { $quoteActive = -1; } -+ if(preg_match('/"$/', $v)) { $quoteActive = -1; } - - } elseif(!trim($v)) { - unset($paramsArr[$k]); // Remove empty elements - -- } elseif(ereg('^"', $v)) { -+ } elseif(preg_match('/^"/', $v)) { - $quoteActive = $k; - } - } diff --git a/lib/typo3/class.t3lib_cs.php b/lib/typo3/class.t3lib_cs.php index 2f34caf0c88..28f7b1f7026 100644 --- a/lib/typo3/class.t3lib_cs.php +++ b/lib/typo3/class.t3lib_cs.php @@ -781,8 +781,8 @@ class t3lib_cs { $trans_tbl = array_flip(get_html_translation_table(HTML_ENTITIES)); // Getting them in iso-8859-1 - but thats ok since this is observed below. } - $token = 'a'.md5(microtime());//token must start with a letter or preg_replace substitution won't work - $parts = explode($token,preg_replace('/(&([#[:alnum:]]*);)/',$token.'\2'.$token,$str)); + $token = md5(microtime()); + $parts = explode($token,ereg_replace('(&([#[:alnum:]]*);)',$token.'\2'.$token,$str)); foreach($parts as $k => $v) { if ($k%2) { if (substr($v,0,1)=='#') { // Dec or hex entities: @@ -974,13 +974,13 @@ class t3lib_cs { // Detect type if not done yet: (Done on first real line) // The "whitespaced" type is on the syntax "0x0A 0x000A #LINE FEED" while "ms-token" is like "B9 = U+00B9 : SUPERSCRIPT ONE" - if (!$detectedType) $detectedType = preg_match('/[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+/',$value) ? 'whitespaced' : 'ms-token'; + if (!$detectedType) $detectedType = ereg('[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+',$value) ? 'whitespaced' : 'ms-token'; if ($detectedType=='ms-token') { list($hexbyte,$utf8) = split('=|:',$value,3); } elseif ($detectedType=='whitespaced') { $regA=array(); - preg_match('/[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+/',$value,$regA); + ereg('[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+',$value,$regA); $hexbyte = $regA[1]; $utf8 = 'U+'.$regA[2]; } @@ -1084,7 +1084,7 @@ class t3lib_cs { // accented Latin letters without "official" decomposition $match = array(); - if (preg_match('/^LATIN (SMALL|CAPITAL) LETTER ([A-Z]) WITH/',$name,$match) && !$decomp) { + if (ereg('^LATIN (SMALL|CAPITAL) LETTER ([A-Z]) WITH',$name,$match) && !$decomp) { $c = ord($match[2]); if ($match[1] == 'SMALL') $c += 32; @@ -1093,7 +1093,7 @@ class t3lib_cs { } $match = array(); - if (preg_match('/(<.*>)? *(.+)/',$decomp,$match)) { + if (ereg('(<.*>)? *(.+)',$decomp,$match)) { switch($match[1]) { case '': // add parenthesis as circle replacement, eg (1) $match[2] = '0028 '.$match[2].' 0029'; @@ -1104,7 +1104,7 @@ class t3lib_cs { break; case '': // ignore multi char decompositions that start with a space - if (preg_match('/^0020 /',$match[2])) continue 2; + if (ereg('^0020 ',$match[2])) continue 2; break; // ignore Arabic and vertical layout presentation decomposition diff --git a/lib/typo3/class.t3lib_div.php b/lib/typo3/class.t3lib_div.php index 8bafb6e1627..cc2c69e0d02 100644 --- a/lib/typo3/class.t3lib_div.php +++ b/lib/typo3/class.t3lib_div.php @@ -798,7 +798,7 @@ class t3lib_div { * @return array Contains keys [path], [file], [filebody], [fileext], [realFileext] */ function split_fileref($fileref) { - if ( preg_match('#(.*/)(.*)$#',$fileref,$reg) ) { + if ( ereg('(.*/)(.*)$',$fileref,$reg) ) { $info['path'] = $reg[1]; $info['file'] = $reg[2]; } else { @@ -806,7 +806,7 @@ class t3lib_div { $info['file'] = $fileref; } $reg=''; - if ( preg_match('/(.*)\.([^\.]*$)/',$info['file'],$reg) ) { + if ( ereg('(.*)\.([^\.]*$)',$info['file'],$reg) ) { $info['filebody'] = $reg[1]; $info['fileext'] = strtolower($reg[2]); $info['realFileext'] = $reg[2]; @@ -882,7 +882,7 @@ class t3lib_div { * @return string */ function rm_endcomma($string) { - return preg_replace('/,$/','',$string); + return ereg_replace(',$','',$string); } /** @@ -896,7 +896,7 @@ class t3lib_div { */ function danish_strtoupper($string) { $value = strtoupper($string); - return strtr($value, '���������������', '���������������'); + return strtr($value, '', ''); } /** @@ -904,13 +904,13 @@ class t3lib_div { * Only known characters will be converted, so don't expect a result for any character. * (DEPRECIATED: Works only for western europe single-byte charsets! Use t3lib_cs::specCharsToASCII() instead!) * - * � => ae, � => Oe + * => ae, => Oe * * @param string String to convert. * @return string */ function convUmlauts($str) { - $pat = array ( '/�/', '/�/', '/�/', '/�/', '/�/', '/�/', '/�/', '/�/', '/�/', '/�/', '/�/', '/�/', '/�/' ); + $pat = array ( '//', '//', '//', '//', '//', '//', '//', '//', '//', '//', '//', '//', '//' ); $repl = array ( 'ae', 'Ae', 'oe', 'Oe', 'ue', 'Ue', 'ss', 'aa', 'AA', 'oe', 'OE', 'ae', 'AE' ); return preg_replace($pat,$repl,$str); } @@ -1022,7 +1022,7 @@ class t3lib_div { * @see calcParenthesis() */ function calcPriority($string) { - $string=preg_replace('/[ ]*/','',$string); // removing all whitespace + $string=ereg_replace('[[:space:]]*','',$string); // removing all whitespace $string='+'.$string; // Ensuring an operator for the first entrance $qm='\*\/\+-^%'; $regex = '(['.$qm.'])(['.$qm.']?[0-9\.]*)'; @@ -1103,7 +1103,7 @@ class t3lib_div { * @return string Converted result. */ function deHSCentities($str) { - return preg_replace('/&([#A-Za-z0-9]*;)/','&\1',$str); + return ereg_replace('&([#[:alnum:]]*;)','&\1',$str); } /** @@ -1154,7 +1154,7 @@ class t3lib_div { function validEmail($email) { $email = trim ($email); if (strstr($email,' ')) return FALSE; - return preg_match('/^[A-Za-z0-9\._-]+[@][A-Za-z0-9\._-]+[\.].[A-Za-z0-9]+$/',$email) ? TRUE : FALSE; + return ereg('^[A-Za-z0-9\._-]+[@][A-Za-z0-9\._-]+[\.].[A-Za-z0-9]+$',$email) ? TRUE : FALSE; } /** @@ -1555,7 +1555,7 @@ class t3lib_div { $name = ''; } } else { - if ($key = strtolower(preg_replace('/[^a-zA-Z0-9]/','',$val))) { + if ($key = strtolower(ereg_replace('[^a-zA-Z0-9]','',$val))) { $attributes[$key] = ''; $name = $key; } @@ -1580,9 +1580,9 @@ class t3lib_div { * @internal */ function split_tag_attributes($tag) { - $tag_tmp = trim(preg_replace ('/^<[^[:space:]]*/i','',trim($tag))); + $tag_tmp = trim(eregi_replace ('^<[^[:space:]]*','',trim($tag))); // Removes any > in the end of the string - $tag_tmp = trim(preg_replace ('/>$/i','',$tag_tmp)); + $tag_tmp = trim(eregi_replace ('>$','',$tag_tmp)); while (strcmp($tag_tmp,'')) { // Compared with empty string instead , 030102 $firstChar=substr($tag_tmp,0,1); @@ -1653,7 +1653,7 @@ class t3lib_div { * @param boolean Wrap script element in linebreaks? Default is TRUE. * @return string The wrapped JS code, ready to put into a XHTML page * @author Ingmar Schlecht - * @author Ren� Fritz + * @author Ren Fritz */ function wrapJS($string, $linebreak=TRUE) { if(trim($string)) { @@ -1813,7 +1813,7 @@ class t3lib_div { } // The tag name is cleaned up so only alphanumeric chars (plus - and _) are in there and not longer than 100 chars either. - $tagName = substr(preg_replace('/[^[:alnum:]_-]/','',$tagName),0,100); + $tagName = substr(ereg_replace('[^[:alnum:]_-]','',$tagName),0,100); // If the value is an array then we will call this function recursively: if (is_array($v)) { @@ -1902,7 +1902,7 @@ class t3lib_div { // What we do here fixes the problem but ONLY if the charset is utf-8, iso-8859-1 or us-ascii. That should work for most TYPO3 installations, in particular if people use utf-8 which we highly recommend. if ((double)phpversion()>=5) { unset($ereg_result); - preg_match('/^[[:space:]]*<\?xml[^>]*encoding[[:space:]]*=[[:space:]]*"([^"]*)"/',substr($string,0,200),$ereg_result); + ereg('^[[:space:]]*<\?xml[^>]*encoding[[:space:]]*=[[:space:]]*"([^"]*)"',substr($string,0,200),$ereg_result); $theCharset = $ereg_result[1] ? $ereg_result[1] : ($TYPO3_CONF_VARS['BE']['forceCharset'] ? $TYPO3_CONF_VARS['BE']['forceCharset'] : 'iso-8859-1'); xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $theCharset); // us-ascii / utf-8 / iso-8859-1 } @@ -2042,7 +2042,7 @@ class t3lib_div { function xmlGetHeaderAttribs($xmlData) { $xmlHeader = substr(trim($xmlData),0,200); $reg=array(); - if (preg_match('/^<\?xml([^>]*)\?\>/i',$xmlHeader,$reg)) { + if (eregi('^<\?xml([^>]*)\?\>',$xmlHeader,$reg)) { return t3lib_div::get_tag_attributes($reg[1]); } } @@ -2163,7 +2163,7 @@ class t3lib_div { // Checking if the "subdir" is found: $subdir = substr($fI['dirname'],strlen($dirName)); if ($subdir) { - if (preg_match('#^[[:alnum:]_]+\/$#',$subdir)) { + if (ereg('^[[:alnum:]_]+\/$',$subdir)) { $dirName.= $subdir; if (!@is_dir($dirName)) { t3lib_div::mkdir($dirName); @@ -2191,7 +2191,7 @@ class t3lib_div { * @return boolean TRUE if @mkdir went well! */ function mkdir($theNewFolder) { - $theNewFolder = preg_replace('#\/$#','',$theNewFolder); + $theNewFolder = ereg_replace('\/$','',$theNewFolder); if (mkdir($theNewFolder, octdec($GLOBALS['TYPO3_CONF_VARS']['BE']['folderCreateMask']))){ chmod($theNewFolder, octdec($GLOBALS['TYPO3_CONF_VARS']['BE']['folderCreateMask'])); //added this line, because the mode at 'mkdir' has a strange behaviour sometimes @@ -2240,7 +2240,7 @@ class t3lib_div { // Initialize variabels: $filearray = array(); $sortarray = array(); - $path = preg_replace('#\/$#','',$path); + $path = ereg_replace('\/$','',$path); // Find files+directories: if (@is_dir($path)) { @@ -2564,7 +2564,7 @@ class t3lib_div { $pString = t3lib_div::implodeArrayForUrl('',$params); - return $pString ? $parts.'?'.preg_replace('/^&/','',$pString) : $parts; + return $pString ? $parts.'?'.ereg_replace('^&','',$pString) : $parts; } /** @@ -2673,7 +2673,7 @@ class t3lib_div { case 'REQUEST_URI': // Typical application of REQUEST_URI is return urls, forms submitting to itself etc. Example: returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')) if (!$_SERVER['REQUEST_URI']) { // This is for ISS/CGI which does not have the REQUEST_URI available. - return '/'.preg_replace('#^/#','',t3lib_div::getIndpEnv('SCRIPT_NAME')). + return '/'.ereg_replace('^/','',t3lib_div::getIndpEnv('SCRIPT_NAME')). ($_SERVER['QUERY_STRING']?'?'.$_SERVER['QUERY_STRING']:''); } else return $_SERVER['REQUEST_URI']; break; @@ -2826,11 +2826,11 @@ class t3lib_div { break; case 'msie': $tmp = strstr($useragent,'MSIE'); - $bInfo['VERSION'] = doubleval(preg_replace('/^[^0-9]*/','',substr($tmp,4))); + $bInfo['VERSION'] = doubleval(ereg_replace('^[^0-9]*','',substr($tmp,4))); break; case 'opera': $tmp = strstr($useragent,'Opera'); - $bInfo['VERSION'] = doubleval(preg_replace('/^[^0-9]*/','',substr($tmp,5))); + $bInfo['VERSION'] = doubleval(ereg_replace('^[^0-9]*','',substr($tmp,5))); break; case 'konqu': $tmp = strstr($useragent,'Konqueror/'); @@ -2966,7 +2966,7 @@ class t3lib_div { */ function verifyFilenameAgainstDenyPattern($filename) { if (strcmp($filename,'') && strcmp($GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern'],'')) { - $result = preg_match('/'.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern'].'/i',$filename); + $result = eregi($GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern'],$filename); if ($result) return false; // so if a matching filename is found, return false; } return true; @@ -3126,7 +3126,7 @@ class t3lib_div { function readLLfile($fileRef,$langKey) { $file = t3lib_div::getFileAbsFileName($fileRef); if ($file) { - $baseFile = preg_replace('#\.(php|xml)$#', '', $file); + $baseFile = ereg_replace('\.(php|xml)$', '', $file); if (@is_file($baseFile.'.xml')) { $LOCAL_LANG = t3lib_div::readLLXMLfile($baseFile.'.xml', $langKey); @@ -3162,7 +3162,7 @@ class t3lib_div { // Cache file name: $hashSource = substr($fileRef,strlen(PATH_site)).'|'.date('d-m-Y H:i:s',filemtime($fileRef)); $cacheFileName = PATH_site.'typo3temp/llxml/'. - #str_replace('_','',preg_replace('#^.*\/#','',dirname($fileRef))). + #str_replace('_','',ereg_replace('^.*\/','',dirname($fileRef))). #'_'.basename($fileRef). substr(basename($fileRef),10,15). '_'.t3lib_div::shortMD5($hashSource).'.'.$langKey.'.'.$origCharset.'.cache'; @@ -3344,7 +3344,7 @@ class t3lib_div { // Check persistent object and if found, call directly and exit. if (is_array($GLOBALS['T3_VAR']['callUserFunction'][$funcName])) { - return call_user_func( + return call_user_method( $GLOBALS['T3_VAR']['callUserFunction'][$funcName]['method'], $GLOBALS['T3_VAR']['callUserFunction'][$funcName]['obj'], $params, @@ -3405,7 +3405,7 @@ class t3lib_div { ); } // Call method: - $content = call_user_func( + $content = call_user_method( $parts[1], $classObj, $params, @@ -3520,7 +3520,7 @@ class t3lib_div { * @param string Sub type like file extensions or similar. Defined by the service. * @param mixed List of service keys which should be exluded in the search for a service. Array or comma list. * @return object The service object or an array with error info's. - * @author Ren� Fritz + * @author Ren Fritz */ function &makeInstanceService($serviceType, $serviceSubType='', $excludeServiceKeys=array()) { global $T3_SERVICES, $T3_VAR, $TYPO3_CONF_VARS; @@ -3606,7 +3606,7 @@ class t3lib_div { $message=t3lib_div::quoted_printable($message); - if (!$dontEncodeSubject) $subject='=?'.$charset.'?Q?'.trim(t3lib_div::quoted_printable(preg_replace('#/[[:space:]]/#','_',$subject),1000)).'?='; + if (!$dontEncodeSubject) $subject='=?'.$charset.'?Q?'.trim(t3lib_div::quoted_printable(ereg_replace('[[:space:]]','_',$subject),1000)).'?='; break; case '8bit': $headers=trim($headers).chr(10). @@ -3657,11 +3657,11 @@ class t3lib_div { $len+=3; } } - $newVal = preg_replace('/'.chr(32).'$/','=20',$newVal); // Replaces a possible SPACE-character at the end of a line - $newVal = preg_replace('/'.chr(9).'$/','=09',$newVal); // Replaces a possible TAB-character at the end of a line + $newVal = ereg_replace(chr(32).'$','=20',$newVal); // Replaces a possible SPACE-character at the end of a line + $newVal = ereg_replace(chr(9).'$','=09',$newVal); // Replaces a possible TAB-character at the end of a line $newString.=$newVal.chr(13).chr(10); } - return preg_replace('/'.chr(13).chr(10).'$/','',$newString); + return ereg_replace(chr(13).chr(10).'$','',$newString); } /** @@ -3853,12 +3853,12 @@ class t3lib_div { if($quoteActive > -1) { $paramsArr[$quoteActive] .= ' '.$v; unset($paramsArr[$k]); - if(preg_match('/"$/', $v)) { $quoteActive = -1; } + if(ereg('"$', $v)) { $quoteActive = -1; } } elseif(!trim($v)) { unset($paramsArr[$k]); // Remove empty elements - } elseif(preg_match('/^"/', $v)) { + } elseif(ereg('^"', $v)) { $quoteActive = $k; } } diff --git a/lib/xmldb/README_MOODLE.txt b/lib/xmldb/README_MOODLE.txt deleted file mode 100644 index bcbbf84648e..00000000000 --- a/lib/xmldb/README_MOODLE.txt +++ /dev/null @@ -1,19 +0,0 @@ -18 Nov 2009 -Description of modifications to remove ereg related functions deprecated as of php 5.3. Patch below. - -Index: classes/XMLDBObject.class.php -=================================================================== -RCS file: /cvsroot/moodle/moodle/lib/xmldb/classes/Attic/XMLDBObject.class.php,v -retrieving revision 1.7.2.1 -diff -u -r1.7.2.1 XMLDBObject.class.php ---- classes/XMLDBObject.class.php 15 Aug 2008 11:09:51 -0000 1.7.2.1 -+++ classes/XMLDBObject.class.php 18 Nov 2009 06:55:49 -0000 -@@ -164,7 +164,7 @@ - function checkName () { - $result = true; - -- if ($this->name != eregi_replace('[^a-z0-9_ -]', '', $this->name)) { -+ if ($this->name != preg_replace('/[^a-z0-9_ -]/i', '', $this->name)) { - $result = false; - } - return $result; diff --git a/lib/xmldb/classes/XMLDBObject.class.php b/lib/xmldb/classes/XMLDBObject.class.php index dfa66680fb5..914b34dc521 100644 --- a/lib/xmldb/classes/XMLDBObject.class.php +++ b/lib/xmldb/classes/XMLDBObject.class.php @@ -164,7 +164,7 @@ class XMLDBObject { function checkName () { $result = true; - if ($this->name != preg_replace('/[^a-z0-9_ -]/i', '', $this->name)) { + if ($this->name != eregi_replace('[^a-z0-9_ -]', '', $this->name)) { $result = false; } return $result; diff --git a/login/index.php b/login/index.php index e6dbf8114b7..72a36b9f424 100644 --- a/login/index.php +++ b/login/index.php @@ -109,7 +109,7 @@ httpsrequired(); $frm->username = trim(moodle_strtolower($frm->username)); if (is_enabled_auth('none') && empty($CFG->extendedusernamechars)) { - $string = preg_replace("/[^(-\.[:alnum:])]/i", "", $frm->username); + $string = eregi_replace("[^(-\.[:alnum:])]", "", $frm->username); if (strcmp($frm->username, $string)) { $errormsg = get_string('username').': '.get_string("alphanumerical"); $errorcode = 2; diff --git a/login/signup_form.php b/login/signup_form.php index 0e172515d6f..9abc3f8ec4f 100644 --- a/login/signup_form.php +++ b/login/signup_form.php @@ -99,7 +99,7 @@ class login_signup_form extends moodleform { $errors['username'] = get_string('usernameexists'); } else { if (empty($CFG->extendedusernamechars)) { - $string = preg_replace("/[^(-\.[:alnum:])]/i", '', $data['username']); + $string = eregi_replace("[^(-\.[:alnum:])]", '', $data['username']); if (strcmp($data['username'], $string)) { $errors['username'] = get_string('alphanumerical'); } diff --git a/mnet/lib.php b/mnet/lib.php index e6fc7f4d1a9..7a0478eef0e 100644 --- a/mnet/lib.php +++ b/mnet/lib.php @@ -314,7 +314,7 @@ function mnet_generate_keypair($dn = null, $days=28) { } $host = strtolower($CFG->wwwroot); - $host = preg_replace("#^http(s)?://#",'',$host); + $host = ereg_replace("^http(s)?://",'',$host); $break = strpos($host.'/' , '/'); $host = substr($host, 0, $break); diff --git a/mnet/xmlrpc/server.php b/mnet/xmlrpc/server.php index c07d7714c96..a7cce24e644 100644 --- a/mnet/xmlrpc/server.php +++ b/mnet/xmlrpc/server.php @@ -321,7 +321,7 @@ function mnet_server_dummy_method($methodname, $argsarray, $functionname) { if (!is_object($MNET_REMOTE_CLIENT->object_to_call)) { return @call_user_func_array($functionname, $argsarray); } else { - return @call_user_func_array( array($MNET_REMOTE_CLIENT->object_to_call,$functionname), $argsarray); + return @call_user_method_array($functionname, $MNET_REMOTE_CLIENT->object_to_call, $argsarray); } } diff --git a/mod/chat/chatd.php b/mod/chat/chatd.php index 52630590b91..ebd14a6523b 100755 --- a/mod/chat/chatd.php +++ b/mod/chat/chatd.php @@ -985,7 +985,7 @@ while(true) { continue; } - if(!preg_match('/win=(chat|users|message|beep).*&chat_sid=([a-zA-Z0-9]*) HTTP/', $data, $info)) { + if(!ereg('win=(chat|users|message|beep).*&chat_sid=([a-zA-Z0-9]*) HTTP', $data, $info)) { // Malformed data $DAEMON->trace('UFO with '.$handle.': Request with malformed data; connection closed', E_USER_WARNING); $DAEMON->dismiss_ufo($handle, true, 'Request with malformed data; connection closed'); @@ -1011,7 +1011,7 @@ while(true) { break; case 'beep': $type = CHAT_SIDEKICK_BEEP; - if(!preg_match('/beep=([^&]*)[& ]/', $data, $info)) { + if(!ereg('beep=([^&]*)[& ]', $data, $info)) { $DAEMON->trace('Beep sidekick did not contain a valid userid', E_USER_WARNING); $DAEMON->dismiss_ufo($handle, true, 'Request with malformed data; connection closed'); continue; @@ -1022,7 +1022,7 @@ while(true) { break; case 'message': $type = CHAT_SIDEKICK_MESSAGE; - if(!preg_match('/chat_message=([^&]*)[& ]chat_msgidnr=([^&]*)[& ]/', $data, $info)) { + if(!ereg('chat_message=([^&]*)[& ]chat_msgidnr=([^&]*)[& ]', $data, $info)) { $DAEMON->trace('Message sidekick did not contain a valid message', E_USER_WARNING); $DAEMON->dismiss_ufo($handle, true, 'Request with malformed data; connection closed'); continue; diff --git a/mod/lesson/format.php b/mod/lesson/format.php index 1804ab98aaf..cc9abe48f01 100644 --- a/mod/lesson/format.php +++ b/mod/lesson/format.php @@ -163,7 +163,7 @@ class qformat_default { $filearray = file($filename); /// Check for Macintosh OS line returns (ie file on one line), and fix - if (preg_match("/\r/", $filearray[0]) AND !preg_match("/\n/", $filearray[0])) { + if (ereg("\r", $filearray[0]) AND !ereg("\n", $filearray[0])) { return explode("\r", $filearray[0]); } else { return $filearray; diff --git a/mod/lesson/reformat.php b/mod/lesson/reformat.php index f4f5279f7d2..e13bc762078 100644 --- a/mod/lesson/reformat.php +++ b/mod/lesson/reformat.php @@ -13,7 +13,7 @@ function removedoublecr($filename) { $filearray = file($filename); /// Check for Macintosh OS line returns (ie file on one line), and fix - if (preg_match("#\r#", $filearray[0]) AND !preg_match("#\n#", $filearray[0])) { + if (ereg("\r", $filearray[0]) AND !ereg("\n", $filearray[0])) { $outfile = explode("\r", $filearray[0]); } else { $outfile = $filearray;