From c8db07011a0dcacf4c5505a59da32a1d60c26c00 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 22 Oct 2009 10:12:45 +0000 Subject: [PATCH] Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 --- .../includes/barcode/php-barcode/encode_bars.php | 4 ++-- .../includes/barcode/php-barcode/php-barcode.php | 14 +++++++------- htdocs/includes/boxes/box_external_rss.php | 2 +- htdocs/includes/geoip/geoip.inc | 2 +- .../includes/menus/barre_top/eldy_backoffice.php | 6 ++++-- .../includes/menus/barre_top/eldy_frontoffice.php | 6 ++++-- htdocs/includes/menus/barre_top/rodolphe.php | 6 ++++-- 7 files changed, 23 insertions(+), 17 deletions(-) diff --git a/htdocs/includes/barcode/php-barcode/encode_bars.php b/htdocs/includes/barcode/php-barcode/encode_bars.php index e24b7b1c05d..c1fb5f0e7a8 100644 --- a/htdocs/includes/barcode/php-barcode/encode_bars.php +++ b/htdocs/includes/barcode/php-barcode/encode_bars.php @@ -52,9 +52,9 @@ function barcode_encode_ean($ean, $encoding = "EAN-13"){ } $encoding=strtoupper($encoding); if ($encoding=="ISBN"){ - if (!ereg("^978", $ean)) $ean="978".$ean; + if (!preg_match("/^978/", $ean)) $ean="978".$ean; } - if (ereg("^978", $ean)) $encoding="ISBN"; + if (preg_match("/^978/", $ean)) $encoding="ISBN"; if (strlen($ean)<12 || strlen($ean)>13){ return array("text"=>"Invalid $encoding Code (must have 12/13 numbers)"); } diff --git a/htdocs/includes/barcode/php-barcode/php-barcode.php b/htdocs/includes/barcode/php-barcode/php-barcode.php index 1e27be11703..19e9cf6beef 100644 --- a/htdocs/includes/barcode/php-barcode/php-barcode.php +++ b/htdocs/includes/barcode/php-barcode/php-barcode.php @@ -134,7 +134,7 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $width=false; continue; } - if (ereg("[a-z]", $val)){ + if (preg_match("/[a-z]/", $val)){ /* tall bar */ $val=ord($val)-ord('a')+1; } @@ -184,7 +184,7 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $width=false; continue; } - if (ereg("[a-z]", $val)){ + if (preg_match("/[a-z]/", $val)){ /* tall bar */ $val=ord($val)-ord('a')+1; $h=$height2; @@ -253,7 +253,7 @@ function barcode_outtext($code,$bars){ for ($a=0;$a<$val;$a++) $bar_line.="-"; continue; } - if (ereg("[a-z]", $val)){ + if (preg_match("/[a-z]/", $val)){ $val=ord($val)-ord('a')+1; $h=$heigh2; for ($a=0;$a<$val;$a++) $bar_line.="I"; @@ -312,7 +312,7 @@ function barcode_outhtml($code, $bars, $scale = 1, $total_y = 0, $space = ''){ $width=false; continue; } - if (ereg("[a-z]", $val)){ + if (preg_match("/[a-z]/", $val)){ //hoher strich $val=ord($val)-ord('a')+1; $h=$height2; @@ -395,16 +395,16 @@ function barcode_encode_genbarcode($code,$encoding){ function barcode_encode($code,$encoding){ global $genbarcode_loc; if ( - ((eregi("^ean$", $encoding) + ((preg_match("/^ean$/i", $encoding) && ( strlen($code)==12 || strlen($code)==13))) || (($encoding) && (eregi("^isbn$", $encoding)) && (( strlen($code)==9 || strlen($code)==10) || - (((ereg("^978", $code) && strlen($code)==12) || + (((preg_match("/^978/", $code) && strlen($code)==12) || (strlen($code)==13))))) || (( !isset($encoding) || !$encoding || (eregi("^ANY$", $encoding) )) - && (ereg("^[0-9]{12,13}$", $code))) + && (preg_match("/^[0-9]{12,13}$/", $code))) ){ /* use built-in EAN-Encoder */ diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php index 5081f7b4022..6641f5bb9f8 100644 --- a/htdocs/includes/boxes/box_external_rss.php +++ b/htdocs/includes/boxes/box_external_rss.php @@ -69,7 +69,7 @@ class box_external_rss extends ModeleBoxes { $this->max=$max; // On recupere numero de param de la boite - ereg('^([0-9]+) ',$this->param,$reg); + preg_match('/^([0-9]+) /',$this->param,$reg); $site=$reg[1]; // Creation rep (pas besoin, on le cree apres recup flux) diff --git a/htdocs/includes/geoip/geoip.inc b/htdocs/includes/geoip/geoip.inc index 6f1c45d135d..3e9306652ce 100644 --- a/htdocs/includes/geoip/geoip.inc +++ b/htdocs/includes/geoip/geoip.inc @@ -493,7 +493,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():''; - ereg("\"(.*)\"",$str,$regs); + preg_match("/\"(.*)\"/",$str,$regs); $str = $regs[1]; return $str; } diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index 3a8982c30e5..fc6424a7e93 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -292,7 +292,8 @@ class MenuTop { if (! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire) { $class=""; - if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"])) + $pattern = str_replace('/','\/',DOL_URL_ROOT); // Add backslashes for regular expression + if (preg_match("/^".$pattern."\/telephonie\//",$_SERVER["PHP_SELF"])) { $class='class="tmenusel"'; $_SESSION['idmenu']=''; } @@ -312,7 +313,8 @@ class MenuTop { { $langs->load("energy"); $class=""; - if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"])) + $pattern = str_replace('/','\/',DOL_URL_ROOT); // Add backslashes for regular expression + if (preg_match("/^".$pattern."\/energie\//",$_SERVER["PHP_SELF"])) { $class='class="tmenusel"'; $_SESSION['idmenu']=''; } diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php index 26dc0514208..9c1a3ed3d33 100644 --- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php @@ -292,7 +292,8 @@ class MenuTop { if (! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire) { $class=""; - if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"])) + $pattern = str_replace('/','\/',DOL_URL_ROOT); // Add backslashes for regular expression + if (preg_match("/^".$pattern."\/telephonie\//",$_SERVER["PHP_SELF"])) { $class='class="tmenusel"'; $_SESSION['idmenu']=''; } @@ -312,7 +313,8 @@ class MenuTop { { $langs->load("energy"); $class=""; - if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"])) + $pattern = str_replace('/','\/',DOL_URL_ROOT); // Add backslashes for regular expression + if (preg_match("/^".$pattern."\/energie\//",$_SERVER["PHP_SELF"])) { $class='class="tmenusel"'; $_SESSION['idmenu']=''; } diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php index 694c933c59e..f4a7c56d75c 100644 --- a/htdocs/includes/menus/barre_top/rodolphe.php +++ b/htdocs/includes/menus/barre_top/rodolphe.php @@ -249,7 +249,8 @@ class MenuTop { if ($conf->telephonie->enabled && $user->rights->telephonie->lire) { $class=""; - if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"])) + $pattern = str_replace('/','\/',DOL_URL_ROOT); // Add backslashes for regular expression + if (preg_match("/^".$pattern."\/telephonie\//",$_SERVER["PHP_SELF"])) { $class='class="tmenusel"'; $_SESSION['idmenu']=''; } @@ -267,7 +268,8 @@ class MenuTop { { $langs->load("energy"); $class=""; - if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"])) + $pattern = str_replace('/','\/',DOL_URL_ROOT); // Add backslashes for regular expression + if (preg_match("/^".$pattern."\/energie\//",$_SERVER["PHP_SELF"])) { $class='class="tmenusel"'; $_SESSION['idmenu']=''; }