From 0cc93c1015e1a72e1689ea30609913088ae86320 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 20 Oct 2009 14:22:24 +0000 Subject: [PATCH] Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 --- dev/load/generate-commande.php | 2 +- dev/load/generate-facture.php | 2 +- dev/load/generate-produit.php | 2 +- dev/load/generate-propale.php | 2 +- dev/load/generate-societe.php | 2 +- dev/samples/create_order.php | 6 +++--- dev/samples/create_product.php | 6 +++--- dev/skeletons/build_class_from_table.php | 6 +++--- dev/skeletons/build_webservice_from_class.php | 4 ++-- dev/skeletons/modMyModule.class.php | 2 +- dev/skeletons/skeleton_script.php | 4 ++-- dev/translation/autotranslator.php | 4 ++-- htdocs/adherents/adherent.class.php | 2 +- htdocs/adherents/fiche.php | 2 +- htdocs/adherents/public.php | 4 ++-- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dev/load/generate-commande.php b/dev/load/generate-commande.php index 027ddeaf4c8..21efafc8199 100644 --- a/dev/load/generate-commande.php +++ b/dev/load/generate-commande.php @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=eregi_replace('generate-commande.php','',$_SERVER["PHP_SELF"]); +$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact.class.php"); diff --git a/dev/load/generate-facture.php b/dev/load/generate-facture.php index 5f76e208f67..b3a8be318c3 100644 --- a/dev/load/generate-facture.php +++ b/dev/load/generate-facture.php @@ -32,7 +32,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=eregi_replace('generate-facture.php','',$_SERVER["PHP_SELF"]); +$path=preg_replace('/generate-facture.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/societe.class.php"); diff --git a/dev/load/generate-produit.php b/dev/load/generate-produit.php index 66455a6d802..dc0a0207000 100644 --- a/dev/load/generate-produit.php +++ b/dev/load/generate-produit.php @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=eregi_replace('generate-produit.php','',$_SERVER["PHP_SELF"]); +$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact.class.php"); diff --git a/dev/load/generate-propale.php b/dev/load/generate-propale.php index 51ed44779bd..994c681eea8 100644 --- a/dev/load/generate-propale.php +++ b/dev/load/generate-propale.php @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=eregi_replace('generate-propale.php','',$_SERVER["PHP_SELF"]); +$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); diff --git a/dev/load/generate-societe.php b/dev/load/generate-societe.php index 0f1ae8fa94d..7fa765f7d12 100644 --- a/dev/load/generate-societe.php +++ b/dev/load/generate-societe.php @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=eregi_replace('generate-societe.php','',$_SERVER["PHP_SELF"]); +$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]); require ($path."../htdocs/master.inc.php"); include_once(DOL_DOCUMENT_ROOT."/societe.class.php"); include_once(DOL_DOCUMENT_ROOT."/contact.class.php"); diff --git a/dev/samples/create_order.php b/dev/samples/create_order.php index fe35fbbf4d2..7439f5f7460 100644 --- a/dev/samples/create_order.php +++ b/dev/samples/create_order.php @@ -26,9 +26,9 @@ // Test if batch mode $sapi_type = php_sapi_name(); -$script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$script_file = __FILE__; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file = '/'.$reg[1].'/i'; +$path=preg_replace($script_file,'',$_SERVER["PHP_SELF"]); if (substr($sapi_type, 0, 3) == 'cgi') { echo "Error: You are using PHP for CGI/Web. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; diff --git a/dev/samples/create_product.php b/dev/samples/create_product.php index 5a92f69fba0..cd3372abea5 100644 --- a/dev/samples/create_product.php +++ b/dev/samples/create_product.php @@ -26,9 +26,9 @@ // Test if batch mode $sapi_type = php_sapi_name(); -$script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$script_file = __FILE__; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file = '/'.$reg[1].'/i'; +$path=preg_replace($script_file,'',$_SERVER["PHP_SELF"]); if (substr($sapi_type, 0, 3) == 'cgi') { echo "Error: You are using PHP for CGI/Web. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php index fe8e2e558be..f6e7ab0798f 100644 --- a/dev/skeletons/build_class_from_table.php +++ b/dev/skeletons/build_class_from_table.php @@ -26,8 +26,8 @@ // Test if batch mode $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file = '/'.$reg[1].'/i'; +$path=preg_replace($script_file,'',$_SERVER["PHP_SELF"]); if (substr($sapi_type, 0, 3) == 'cgi') { @@ -123,7 +123,7 @@ else // Define working variables $table=strtolower($table); -$tablenollx=eregi_replace('llx_','',$table); +$tablenollx=preg_replace('/llx_/i','',$table); $class=ucfirst($tablenollx); $classmin=strtolower($class); diff --git a/dev/skeletons/build_webservice_from_class.php b/dev/skeletons/build_webservice_from_class.php index f154bc2a209..dc5efecece3 100644 --- a/dev/skeletons/build_webservice_from_class.php +++ b/dev/skeletons/build_webservice_from_class.php @@ -26,8 +26,8 @@ // Test if batch mode $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file = '/'.$reg[1].'/i'; +$path=preg_replace($script_file,'',$_SERVER["PHP_SELF"]); if (substr($sapi_type, 0, 3) == 'cgi') { diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index fdb14f5b81d..459088658fe 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -54,7 +54,7 @@ class modMyModule extends DolibarrModules // It is used to group modules in module setup page $this->family = "other"; // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) - $this->name = eregi_replace('^mod','',get_class($this)); + $this->name = preg_replace('/^mod/i','',get_class($this)); // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module) $this->description = "Description of module MyModule"; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version diff --git a/dev/skeletons/skeleton_script.php b/dev/skeletons/skeleton_script.php index 6836b21a3ad..4ca769b753c 100644 --- a/dev/skeletons/skeleton_script.php +++ b/dev/skeletons/skeleton_script.php @@ -29,8 +29,8 @@ // Test if batch mode and define path of script $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file = '/'.$reg[1].'/i'; +$path=preg_replace($script_file,'',$_SERVER["PHP_SELF"]); if (substr($sapi_type, 0, 3) == 'cgi') { echo "Error: You are using PHP for CGI/Web. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php index 979f5bf37d5..aef9e3b37cd 100644 --- a/dev/translation/autotranslator.php +++ b/dev/translation/autotranslator.php @@ -28,8 +28,8 @@ // Test if batch mode $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file = '/'.$reg[1].'/i'; +$path=preg_replace($script_file,'',$_SERVER["PHP_SELF"]); if (substr($sapi_type, 0, 3) == 'cgi') { echo "Error: You ar usingr PH for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php index 9c82a174e32..368d8d4ead2 100644 --- a/htdocs/adherents/adherent.class.php +++ b/htdocs/adherents/adherent.class.php @@ -713,7 +713,7 @@ class Adherent extends CommonObject $error=0; - dol_syslog("Adherent::Password user=".$user->id." password=".eregi_replace('.','*',$password)." isencrypted=".$isencrypted); + dol_syslog("Adherent::Password user=".$user->id." password=".preg_replace('/./i','*',$password)." isencrypted=".$isencrypted); // Si nouveau mot de passe non communique, on genere par module if (! $password) diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index c1d1dc2c3f3..e7ebf26138f 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -1090,7 +1090,7 @@ if ($rowid && $action != 'edit') print ''; // Password - print ''.$langs->trans("Password").''.eregi_replace('.','*',$adh->pass).''; + print ''.$langs->trans("Password").''.preg_replace('/./i','*',$adh->pass).''; // Type print ''.$langs->trans("Type").''.$adht->getNomUrl(1)."\n"; diff --git a/htdocs/adherents/public.php b/htdocs/adherents/public.php index c2967ee53c9..3fde848cbef 100644 --- a/htdocs/adherents/public.php +++ b/htdocs/adherents/public.php @@ -49,8 +49,8 @@ print ''; print ''; // Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr' $firstpart=$dolibarr_main_url_root; -$regex=DOL_URL_ROOT.'$'; -$firstpart=eregi_replace($regex,'',$firstpart); +$regex='/'.DOL_URL_ROOT.'$/i'; +$firstpart=preg_replace($regex,'',$firstpart); print ''; print ''; print '';
'.$langs->trans("Description").''.$langs->trans("URL").'
'.$langs->trans("BlankSubscriptionForm").''.$firstpart.DOL_URL_ROOT.'/public/members/new.php'.'
'.$langs->trans("PublicMemberList").''.$firstpart.DOL_URL_ROOT.'/public/members/public_list.php'.'
'.$langs->trans("PublicMemberCard").''.$firstpart.DOL_URL_ROOT.'/public/members/public_card.php?id=xxx'.'