diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 162a44c889c..e007682383d 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -2736,7 +2736,7 @@ function dol_htmlentitiesbr_decode($stringtodecode,$pagecodeto='UTF-8')
$ret=@html_entity_decode($stringtodecode,ENT_COMPAT,$pagecodeto);
$ret=preg_replace('/'."\r\n".'
/i',"
",$ret);
$ret=preg_replace('/
'."\r\n".'/i',"\r\n",$ret);
- $ret=eregi_replace('/
'."\n".'/i',"\n",$ret);
+ $ret=preg_replace('/
'."\n".'/i',"\n",$ret);
$ret=preg_replace('/
/i',"\n",$ret);
return $ret;
}
diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php
index 8eebdaa7988..fe5b5951d5a 100644
--- a/htdocs/lib/functions2.lib.php
+++ b/htdocs/lib/functions2.lib.php
@@ -281,7 +281,7 @@ function clean_url($url,$http=1)
// Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
// To include the minus sign in a char class, we must not escape it but put it at the end of the class
// Also, there's no need of escape a dot sign in a class
- if (eregi('^(https?:[\\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?',$url,$regs))
+ if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i',$url,$regs))
{
$proto=$regs[1];
$domain=$regs[2];
@@ -294,15 +294,18 @@ function clean_url($url,$http=1)
$newproto=$proto;
if ($http==0)
{
- if (eregi('^http:[\\\/]+',$url))
+ if (preg_match('/^http:[\\/]+/i',$url))
{
- $url = eregi_replace('^http:[\\\/]+','',$url);
+ $url = preg_replace('/^http:[\\/]+/i','',$url);
$newproto = '';
}
}
+ // Add backslashes for regular expression
+ $proto = str_replace('/','\/',$proto);
+
// On passe le nom de domaine en minuscule
- $CleanUrl = eregi_replace('^'.$proto.$domain, $newproto.strtolower($domain), $url);
+ $CleanUrl = preg_replace('/^'.$proto.$domain.'/i', $newproto.strtolower($domain), $url);
return $CleanUrl;
}
@@ -386,34 +389,34 @@ function get_next_value($db,$mask,$table,$field,$where='',$valueforccc='',$date=
else $maskrefclient='';
$maskwithonlyymcode=$mask;
- $maskwithonlyymcode=eregi_replace('\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}',$maskcounter,$maskwithonlyymcode);
- $maskwithonlyymcode=eregi_replace('\{dd\}','dd',$maskwithonlyymcode);
- $maskwithonlyymcode=eregi_replace('\{(c+)(0*)\}',$maskrefclient,$maskwithonlyymcode);
+ $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode);
+ $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
+ $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
$maskwithnocode=$maskwithonlyymcode;
- $maskwithnocode=eregi_replace('\{yyyy\}','yyyy',$maskwithnocode);
- $maskwithnocode=eregi_replace('\{yy\}','yy',$maskwithnocode);
- $maskwithnocode=eregi_replace('\{y\}','y',$maskwithnocode);
- $maskwithnocode=eregi_replace('\{mm\}','mm',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);
// Now maskwithnocode = 0000ddmmyyyyccc for example
// and maskcounter = 0000 for example
//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
";
// If an offset is asked
- if (! empty($reg[2]) && eregi('^\+',$reg[2])) $maskoffset=eregi_replace('^\+','',$reg[2]);
- if (! empty($reg[3]) && eregi('^\+',$reg[3])) $maskoffset=eregi_replace('^\+','',$reg[3]);
+ if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
+ if (! empty($reg[3]) && preg_match('/^\+/',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
// Define $sqlwhere
// If a restore to zero after a month is asked we check if there is already a value for this year.
- if (! empty($reg[2]) && eregi('^@',$reg[2])) $maskraz=eregi_replace('^@','',$reg[2]);
- if (! empty($reg[3]) && eregi('^@',$reg[3])) $maskraz=eregi_replace('^@','',$reg[3]);
+ if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) $maskraz=preg_replace('/^@/','',$reg[2]);
+ if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) $maskraz=preg_replace('/^@/','',$reg[3]);
if ($maskraz >= 0)
{
if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
// Define reg
- if ($maskraz > 1 && ! eregi('^(.*)\{(y+)\}\{(m+)\}',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
- if ($maskraz <= 1 && ! eregi('^(.*)\{(y+)\}',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+ if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+ if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
//print "x".$maskwithonlyymcode." ".$maskraz;
// Define $yearcomp and $monthcomp (that will be use in the select where to search max number)
@@ -593,34 +596,34 @@ function check_value($mask,$value)
else $maskrefclient='';
$maskwithonlyymcode=$mask;
- $maskwithonlyymcode=eregi_replace('\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}',$maskcounter,$maskwithonlyymcode);
- $maskwithonlyymcode=eregi_replace('\{dd\}','dd',$maskwithonlyymcode);
- $maskwithonlyymcode=eregi_replace('\{(c+)(0*)\}',$maskrefclient,$maskwithonlyymcode);
+ $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i',$maskcounter,$maskwithonlyymcode);
+ $maskwithonlyymcode=preg_replace('/\{dd\}/i','dd',$maskwithonlyymcode);
+ $maskwithonlyymcode=preg_replace('/\{(c+)(0*)\}/i',$maskrefclient,$maskwithonlyymcode);
$maskwithnocode=$maskwithonlyymcode;
- $maskwithnocode=eregi_replace('\{yyyy\}','yyyy',$maskwithnocode);
- $maskwithnocode=eregi_replace('\{yy\}','yy',$maskwithnocode);
- $maskwithnocode=eregi_replace('\{y\}','y',$maskwithnocode);
- $maskwithnocode=eregi_replace('\{mm\}','mm',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{yyyy\}/i','yyyy',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{yy\}/i','yy',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{y\}/i','y',$maskwithnocode);
+ $maskwithnocode=preg_replace('/\{mm\}/i','mm',$maskwithnocode);
// Now maskwithnocode = 0000ddmmyyyyccc for example
// and maskcounter = 0000 for example
//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n
";
// If an offset is asked
- if (! empty($reg[2]) && eregi('^\+',$reg[2])) $maskoffset=eregi_replace('^\+','',$reg[2]);
- if (! empty($reg[3]) && eregi('^\+',$reg[3])) $maskoffset=eregi_replace('^\+','',$reg[3]);
+ if (! empty($reg[2]) && preg_match('/^\+/',$reg[2])) $maskoffset=preg_replace('/^\+/','',$reg[2]);
+ if (! empty($reg[3]) && preg_match('^\+',$reg[3])) $maskoffset=preg_replace('/^\+/','',$reg[3]);
// Define $sqlwhere
// If a restore to zero after a month is asked we check if there is already a value for this year.
- if (! empty($reg[2]) && eregi('^@',$reg[2])) $maskraz=eregi_replace('^@','',$reg[2]);
- if (! empty($reg[3]) && eregi('^@',$reg[3])) $maskraz=eregi_replace('^@','',$reg[3]);
+ if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) $maskraz=preg_replace('/^@/','',$reg[2]);
+ if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) $maskraz=preg_replace('/^@/','',$reg[3]);
if ($maskraz >= 0)
{
if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
// Define reg
- if ($maskraz > 1 && ! eregi('^(.*)\{(y+)\}\{(m+)\}',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
- if ($maskraz <= 1 && ! eregi('^(.*)\{(y+)\}',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
+ if ($maskraz > 1 && ! preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+ if ($maskraz <= 1 && ! preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) return 'ErrorCantUseRazIfNoYearInMask';
//print "x".$maskwithonlyymcode." ".$maskraz;
}
//print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."
\n";
@@ -724,7 +727,7 @@ function numero_semaine($time)
{
$stime = strftime('%Y-%m-%d',$time);
- if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?',$stime,$reg))
+ if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i',$stime,$reg))
{
// Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
$annee = $reg[1];
@@ -767,7 +770,7 @@ function numero_semaine($time)
$premierJeudiAnnee = mktime(12,0,0,1,1,date("Y",$jeudiSemaine));
}
- // D�finition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
+ // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
$numeroSemaine = (
(
date("z",mktime(12,0,0,date("m",$jeudiSemaine),date("d",$jeudiSemaine),date("Y",$jeudiSemaine)))
@@ -779,7 +782,7 @@ function numero_semaine($time)
// Cas particulier de la semaine 53
if ($numeroSemaine==53)
{
- // Les annees qui commence un Jeudi et les ann�es bissextiles commencant un Mercredi en possede 53
+ // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
if (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==4 || (date("w",mktime(12,0,0,1,1,date("Y",$jeudiSemaine)))==3 && date("z",mktime(12,0,0,12,31,date("Y",$jeudiSemaine)))==365))
{
$numeroSemaine = 53;
diff --git a/htdocs/lib/images.lib.php b/htdocs/lib/images.lib.php
index b15f2c3f53b..d1c00f79cf7 100644
--- a/htdocs/lib/images.lib.php
+++ b/htdocs/lib/images.lib.php
@@ -212,7 +212,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
- $fileName = eregi_replace('(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$','',$file); // On enleve extension quelquesoit la casse
+ $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file); // On enleve extension quelquesoit la casse
$fileName = basename($fileName);
$imgThumbName = $dirthumb.$fileName.$extName.$extImg; // Chemin complet du fichier de la vignette
diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php
index 43795199349..3b2076ad43c 100644
--- a/htdocs/lib/invoice.lib.php
+++ b/htdocs/lib/invoice.lib.php
@@ -87,7 +87,7 @@ function facture_prepare_head($fac)
{
$values=explode(':',$value);
if ($values[2]) $langs->load($values[2]);
- $head[$h][0] = eregi_replace('__ID__',$fac->id,$values[3]);
+ $head[$h][0] = preg_replace('/__ID__/i',$fac->id,$values[3]);
$head[$h][1] = $langs->trans($values[1]);
$head[$h][2] = 'tab'.$values[1];
$h++;
diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php
index dd085b7f73e..7f6fa9e0b63 100644
--- a/htdocs/lib/ldap.class.php
+++ b/htdocs/lib/ldap.class.php
@@ -33,7 +33,7 @@ class Ldap
{
/**
- * Tableau des serveurs (IP addresses ou nom d'hôtes)
+ * Tableau des serveurs (IP addresses ou nom d'h�tes)
*/
var $server=array();
/**
@@ -67,7 +67,7 @@ class Ldap
*/
var $groups;
/**
- * Code erreur retourné par le serveur Ldap
+ * Code erreur retourn� par le serveur Ldap
*/
var $ldapErrorCode;
/**
@@ -404,8 +404,8 @@ class Ldap
*/
if ($this->serverType == "activedirectory") {
// FQDN domain
- $domain = eregi_replace('dc=','',$this->domain);
- $domain = eregi_replace(',','.',$domain);
+ $domain = str_replace('dc=','',$this->domain);
+ $domain = str_replace(',','.',$domain);
$checkDn = "$uname@$domain";
} else {
$checkDn = $this->getUserIdentifier()."=".$uname.", ".$this->setDn(true);
@@ -736,9 +736,9 @@ class Ldap
/**
* \brief Returns an array containing a details of elements
- * \param $search Valeur champ clé recherché, sinon '*' pour tous.
+ * \param $search Valeur champ cl� recherch�, sinon '*' pour tous.
* \param $userDn DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org)
- * \param $useridentifier Nom du champ clé (Ex: uid)
+ * \param $useridentifier Nom du champ cl� (Ex: uid)
* \param $attributeArray Array of fields required (Ex: sn,userPassword)
* \param $activefilter 1=utilise le champ this->filter comme filtre
* \return array Array of [id_record][ldap_field]=value
@@ -794,7 +794,7 @@ class Ldap
$info = @ldap_get_entries($this->connection, $this->result);
- // Warning: Dans info, les noms d'attributs sont en minuscule meme si passé
+ // Warning: Dans info, les noms d'attributs sont en minuscule meme si pass�
// a ldap_search en majuscule !!!
//print_r($info);
@@ -812,7 +812,7 @@ class Ldap
$keyattributelower=strtolower($attributeArray[$j]);
//print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."
\n";
- //permet de récupérer le SID avec Active Directory
+ //permet de r�cup�rer le SID avec Active Directory
if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")
{
$objectsid = $this->getObjectSid($recordid);
@@ -843,7 +843,7 @@ class Ldap
/**
- * Récupère le SID de l'utilisateur
+ * R�cup�re le SID de l'utilisateur
* ldapuser. le login de l'utilisateur
* Indispensable pour Active Directory
*/
@@ -875,7 +875,7 @@ class Ldap
if (!$entry)
{
- // Si pas de résultat on cherche dans le domaine
+ // Si pas de r�sultat on cherche dans le domaine
$searchDN = $this->domain;
$i++;
}
@@ -919,11 +919,11 @@ class Ldap
/**
* \brief Fonction de recherche avec filtre
- * \remarks this->connection doit etre défini donc la methode bind ou bindauth doit avoir deja été appelée
+ * \remarks this->connection doit etre d�fini donc la methode bind ou bindauth doit avoir deja �t� appel�e
* \param checkDn DN de recherche (Ex: ou=users,cn=my-domain,cn=com)
* \param filter Filtre de recherche (ex: (sn=nom_personne) )
- * \return array Tableau des reponses (clé en minuscule-valeur)
- * \remarks Ne pas utiliser pour recherche d'une liste donnée de propriétés
+ * \return array Tableau des reponses (cl� en minuscule-valeur)
+ * \remarks Ne pas utiliser pour recherche d'une liste donn�e de propri�t�s
* car conflit majuscule-minuscule. A n'utiliser que pour les pages
* 'Fiche LDAP' qui affiche champ lisibles par defaut.
*/
@@ -956,8 +956,8 @@ class Ldap
/**
- * \brief Récupère les attributs de l'utilisateur
- * \param $user Utilisateur ldap à lire
+ * \brief R�cup�re les attributs de l'utilisateur
+ * \param $user Utilisateur ldap � lire
* \return int >0 if ok, <0 if ko
*/
function fetch($user)
@@ -994,7 +994,7 @@ class Ldap
if (!$result)
{
- // Si pas de résultat on cherche dans le domaine
+ // Si pas de r�sultat on cherche dans le domaine
$searchDN = $this->domain;
$i++;
}
@@ -1033,8 +1033,8 @@ class Ldap
$this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0],$this->ldapcharset));
// FQDN domain
- $domain = eregi_replace('dc=','',$this->domain);
- $domain = eregi_replace(',','.',$domain);
+ $domain = str_replace('dc=','',$this->domain);
+ $domain = str_replace(',','.',$domain);
$this->domainFQDN = $domain;
ldap_free_result($this->result);
diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index 4a396f41c8c..ed1bf3a9f71 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -151,7 +151,7 @@ function show_ldap_content($result,$level,$count,$var,$hide=0)
else
{
$newstring=@htmlentities($val,ENT_COMPAT,'UTF-8'); // Make entity encoding
- if ($hide) print eregi_replace('.','*',$newstring);
+ if ($hide) print preg_replace('/./i','*',$newstring);
else print $newstring;
print '';
}
diff --git a/htdocs/lib/member.lib.php b/htdocs/lib/member.lib.php
index 881c1f516b1..843069b4b0e 100644
--- a/htdocs/lib/member.lib.php
+++ b/htdocs/lib/member.lib.php
@@ -75,7 +75,7 @@ function member_prepare_head($member)
{
$values=explode(':',$value);
if ($values[2]) $langs->load($values[2]);
- $head[$h][0] = eregi_replace('__ID__',$member->id,$values[3]);
+ $head[$h][0] = preg_replace('/__ID__/i',$member->id,$values[3]);
$head[$h][1] = $langs->trans($values[1]);
$head[$h][2] = 'tab'.$values[1];
$h++;
diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php
index 66afe93fa3a..3f366e0c27d 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/lib/order.lib.php
@@ -104,7 +104,7 @@ function commande_prepare_head($commande)
{
$values=explode(':',$value);
if ($values[2]) $langs->load($values[2]);
- $head[$h][0] = eregi_replace('__ID__',$commande->id,$values[3]);
+ $head[$h][0] = preg_replace('/__ID__/i',$commande->id,$values[3]);
$head[$h][1] = $langs->trans($values[1]);
$head[$h][2] = 'tab'.$values[1];
$h++;
diff --git a/htdocs/lib/product.lib.php b/htdocs/lib/product.lib.php
index a5960300059..39114c97805 100644
--- a/htdocs/lib/product.lib.php
+++ b/htdocs/lib/product.lib.php
@@ -129,7 +129,7 @@ function product_prepare_head($product, $user)
{
$values=explode(':',$value);
if ($values[2]) $langs->load($values[2]);
- $head[$h][0] = eregi_replace('__ID__',$product->id,$values[3]);
+ $head[$h][0] = preg_replace('/__ID__/i',$product->id,$values[3]);
$head[$h][1] = $langs->trans($values[1]);
$head[$h][2] = 'tab'.$values[1];
$h++;
diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php
index 90711ed13d2..3fc747e60de 100644
--- a/htdocs/lib/propal.lib.php
+++ b/htdocs/lib/propal.lib.php
@@ -100,7 +100,7 @@ function propal_prepare_head($propal)
{
$values=explode(':',$value);
if ($values[2]) $langs->load($values[2]);
- $head[$h][0] = eregi_replace('__ID__',$propal->id,$values[3]);
+ $head[$h][0] = preg_replace('/__ID__/i',$propal->id,$values[3]);
$head[$h][1] = $langs->trans($values[1]);
$head[$h][2] = 'tab'.$values[1];
$h++;
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 34506ecf39e..d37feacfb0a 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -282,9 +282,9 @@ function dol_loginfunction($langs,$conf,$mysoc)
{
print '
| ';
$i=0;
- while (eregi('__\(([a-zA-Z]+)\)__',$conf->global->MAIN_HOME,$reg) && $i < 100)
+ while (preg_match('/__\(([a-zA-Z]+)\)__/i',$conf->global->MAIN_HOME,$reg) && $i < 100)
{
- $conf->global->MAIN_HOME=eregi_replace('__\('.$reg[1].'\)__',$langs->trans($reg[1]),$conf->global->MAIN_HOME);
+ $conf->global->MAIN_HOME=preg_replace('/__\('.$reg[1].'\)__/i',$langs->trans($reg[1]),$conf->global->MAIN_HOME);
$i++;
}
print nl2br($conf->global->MAIN_HOME);
@@ -369,11 +369,11 @@ function encodedecode_dbpassconf($level=0)
$lineofpass=0;
- if (eregi('^[^#]*dolibarr_main_db_encrypted_pass[ ]*=[ ]*(.*)',$buffer,$reg)) // Old way to save crypted value
+ if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i',$buffer,$reg)) // Old way to save crypted value
{
$val = trim($reg[1]); // This also remove CR/LF
- $val=eregi_replace('^["\']','',$val);
- $val=eregi_replace('["\'][ ;]*$','',$val);
+ $val=preg_replace('/^["\']/','',$val);
+ $val=preg_replace('/["\'][\s;]*$/','',$val);
if (! empty($val))
{
$passwd_crypted = $val;
@@ -382,14 +382,14 @@ function encodedecode_dbpassconf($level=0)
$lineofpass=1;
}
}
- elseif (eregi('^[^#]*dolibarr_main_db_pass[ ]*=[ ]*(.*)',$buffer,$reg))
+ elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i',$buffer,$reg))
{
$val = trim($reg[1]); // This also remove CR/LF
- $val=eregi_replace('^["\']','',$val);
- $val=eregi_replace('["\'][ ;]*$','',$val);
+ $val=preg_replace('/^["\']/','',$val);
+ $val=preg_replace('/["\'][\s;]*$/','',$val);
if (eregi('crypted:',$buffer))
{
- $val = eregi_replace('crypted:','',$val);
+ $val = preg_replace('/crypted:/i','',$val);
$passwd_crypted = $val;
$val = dol_decode($val);
$passwd = $val;
diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php
index bd0ff9e1580..4620127692e 100644
--- a/htdocs/lib/xcal.lib.php
+++ b/htdocs/lib/xcal.lib.php
@@ -87,7 +87,7 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
$email = $event['email'];
$url = $event['url'];
$transparency = $event['transparency']; // OPAQUE or TRANSPARENT
- $description=eregi_replace(' ',"\n",$event['desc']); + $description=preg_replace('/ /i',"\n",$event['desc']); $description=dol_string_nohtmltag($description,0); // Remove html tags // Uncomment for tests @@ -296,7 +296,7 @@ function build_rssfile($format='rss',$title,$desc,$events_array,$outputfile,$fil $url = $event['url']; $author = $event['author']; $category = $event['category']; - $description=eregi_replace(' ',"\n",$event['desc']); + $description=preg_replace('/ /i',"\n",$event['desc']); $description=dol_string_nohtmltag($description,0); // Remove html tags fwrite ($fichier, " "; if ($day > time()) { - $datas[$i] = ''; // Valeur spéciale permettant de ne pas tracer le graph + $datas[$i] = ''; // Valeur sp�ciale permettant de ne pas tracer le graph } else { @@ -380,7 +380,7 @@ foreach ($accounts as $account) //print strftime ("%e %d %m %y",$day)." ".$subtotal."\n "; if ($day > ($max+86400)) { - $datas[$i] = ''; // Valeur spéciale permettant de ne pas tracer le graph + $datas[$i] = ''; // Valeur sp�ciale permettant de ne pas tracer le graph } else { diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index fca8cbff0de..667d784bc19 100644 --- a/scripts/company/sync_contacts_dolibarr2ldap.php +++ b/scripts/company/sync_contacts_dolibarr2ldap.php @@ -27,7 +27,7 @@ // Test si mode CLI $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; @@ -42,7 +42,7 @@ $now=$argv[1]; // Recupere env dolibarr $version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); @@ -62,14 +62,14 @@ print "type=".$conf->db->type."\n"; print "host=".$conf->db->host."\n"; print "port=".$conf->db->port."\n"; print "login=".$conf->db->user."\n"; -//print "pass=".eregi_replace('.','*',$conf->db->password)."\n"; // Not defined for security reasons +//print "pass=".preg_replace('/./i','*',$conf->db->password)."\n"; // Not defined for security reasons print "database=".$conf->db->name."\n"; print "\n"; print "----- To LDAP database:\n"; print "host=".$conf->global->LDAP_SERVER_HOST."\n"; print "port=".$conf->global->LDAP_SERVER_PORT."\n"; print "login=".$conf->global->LDAP_ADMIN_DN."\n"; -print "pass=".eregi_replace('.','*',$conf->global->LDAP_ADMIN_PASS)."\n"; +print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n"; print "DN target=".$conf->global->LDAP_CONTACT_DN."\n"; print "\n"; print "Press a key to confirm...\n"; diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index 3d28d735214..b75dadc48f1 100644 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -41,7 +41,7 @@ if (! isset($argv[1]) || ! $argv[1]) { $id=$argv[1]; // Recupere root dolibarr -$path=eregi_replace('mailing-send.php','',$_SERVER["PHP_SELF"]); +$path=str_replace('mailing-send.php','',$_SERVER["PHP_SELF"]); require_once ($path."../../htdocs/master.inc.php"); @@ -121,7 +121,7 @@ if ($resql) $obj = $db->fetch_object($resql); // sendto en RFC2822 - $sendto = eregi_replace(',',' ',$obj->prenom." ".$obj->nom) ." <".$obj->email.">"; + $sendto = str_replace(',',' ',$obj->prenom." ".$obj->nom) ." <".$obj->email.">"; // Make subtsitutions on topic and body $other=explode(';',$obj->other); diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index 93c91322d45..523c2fb1a6b 100644 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -19,9 +19,9 @@ */ /** - * \file scripts/invoices/email_unpayed_invoices_to_representatives.php + * \file scripts/invoices/email_unpaid_invoices_to_representatives.php * \ingroup facture - * \brief Script to send a mail to dolibarr users linked to companies with unpayed invoices + * \brief Script to send a mail to dolibarr users linked to companies with unpaid invoices * \version $Id$ */ @@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { } // Recupere root dolibarr -$path=eregi_replace('email_unpayed_invoices_to_representatives.php','',$_SERVER["PHP_SELF"]); +$path=str_replace('email_unpaid_invoices_to_representatives.php','',$_SERVER["PHP_SELF"]); require($path."../../htdocs/master.inc.php"); @@ -60,63 +60,63 @@ if ( $db->query($sql) ) $oldemail = ''; $message = ''; $total = ''; - dol_syslog("email_unpayed_invoices_to_representatives.php"); + dol_syslog("email_unpaid_invoices_to_representatives.php"); if ($num) { while ($i < $num) { $obj = $db->fetch_object(); - + if ($obj->email <> $oldemail) { if (strlen($oldemail)) { - envoi_mail($oldemail,$message,$total); + envoi_mail($oldemail,$message,$total); } $oldemail = $obj->email; $message = ''; $total = 0; } - + $message .= "Facture ".$obj->facnumber." : ".price($obj->total_ttc)." : ".$obj->nom."\n"; $total += $obj->total_ttc; - - dol_syslog("email_unpayed_invoices_to_representatives.php: ".$obj->email); + + dol_syslog("email_unpaid_invoices_to_representatives.php: ".$obj->email); $i++; } // Si il reste des envois en buffer if ($total) { - envoi_mail($oldemail,$message,$total); + envoi_mail($oldemail,$message,$total); } } else { - print "No unpayed invoices to companies linked to a particular commercial dolibarr user\n"; + print "No unpaid invoices to companies linked to a particular commercial dolibarr user\n"; } } else { dol_print_error($db); - dol_syslog("email_unpayed_invoices_to_representatives.php: Error"); + dol_syslog("email_unpaid_invoices_to_representatives.php: Error"); } function envoi_mail($oldemail,$message,$total) { global $conf,$langs; - - $subject = "[Dolibarr] List of unpayed invoices"; + + $subject = "[Dolibarr] List of unpaid invoices"; $sendto = $oldemail; $from = $conf->global->MAIN_EMAIL_FROM; $msgishtml = 0; - - print "Envoi mail pour $oldemail, total: $total\n"; - dol_syslog("email_unpayed_invoices_to_representatives.php: send mail to $oldemail"); - $allmessage = "List of unpayed invoices\n"; + print "Envoi mail pour $oldemail, total: $total\n"; + dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to $oldemail"); + + $allmessage = "List of unpaid invoices\n"; $allmessage .= "This list contains only invoices for third parties you are linked to as a sales representative.\n"; $allmessage .= "\n"; $allmessage .= $message; @@ -143,7 +143,7 @@ function envoi_mail($oldemail,$message,$total) } -} - +} + ?> diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index f1d772b2063..16b0006d44e 100644 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -27,8 +27,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]; +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); if (substr($sapi_type, 0, 3) == 'cgi') { echo "Error: You are using PH for CGI/Web. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n"; diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index 83db4babdf4..4e27b6c5893 100644 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Main $version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); @set_time_limit(0); $error=0; @@ -64,14 +64,14 @@ print "type=".$conf->db->type."\n"; print "host=".$conf->db->host."\n"; print "port=".$conf->db->port."\n"; print "login=".$conf->db->user."\n"; -//print "pass=".eregi_replace('.','*',$conf->db->password)."\n"; // Not defined for security reasons +//print "pass=".preg_replace('/./i','*',$conf->db->password)."\n"; // Not defined for security reasons print "database=".$conf->db->name."\n"; print "\n"; print "----- To LDAP database:\n"; print "host=".$conf->global->LDAP_SERVER_HOST."\n"; print "port=".$conf->global->LDAP_SERVER_PORT."\n"; print "login=".$conf->global->LDAP_ADMIN_DN."\n"; -print "pass=".eregi_replace('.','*',$conf->global->LDAP_ADMIN_PASS)."\n"; +print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n"; print "DN target=".$conf->global->LDAP_MEMBER_DN."\n"; print "\n"; print "Press a key to confirm...\n"; diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index aa731b77795..2993937e11d 100644 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Main $version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); @set_time_limit(0); $error=0; $forcecommit=0; @@ -68,7 +68,7 @@ print "----- Synchronize all records from LDAP database:\n"; print "host=".$conf->global->LDAP_SERVER_HOST."\n"; print "port=".$conf->global->LDAP_SERVER_PORT."\n"; print "login=".$conf->global->LDAP_ADMIN_DN."\n"; -print "pass=".eregi_replace('.','*',$conf->global->LDAP_ADMIN_PASS)."\n"; +print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n"; print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n"; print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n"; print "----- To Dolibarr database:\n"; diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index cd44ab98bc7..ce9679c41b2 100644 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; @@ -42,7 +42,7 @@ $now=$argv[1]; // Recupere env dolibarr $version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php index 7f2180497a9..571b1d0b699 100644 --- a/scripts/user/sync_users_dolibarr2ldap.php +++ b/scripts/user/sync_users_dolibarr2ldap.php @@ -27,7 +27,7 @@ // Test si mode batch $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; @@ -42,7 +42,7 @@ $now=$argv[1]; // Recupere env dolibarr $version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/ldap.class.php"); diff --git a/scripts/withdrawals/prelevement-verif.php b/scripts/withdrawals/prelevement-verif.php index cf5d6015ba8..dec873f9841 100644 --- a/scripts/withdrawals/prelevement-verif.php +++ b/scripts/withdrawals/prelevement-verif.php @@ -27,7 +27,7 @@ // Test si mode CLI $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere env dolibarr $version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); @@ -46,10 +46,10 @@ $error = 0; $puser = new user($db, PRELEVEMENT_USER); $puser->fetch(); -dol_syslog("Pr�l�vements effectu�s par ".$puser->fullname." [".PRELEVEMENT_USER."]"); +dol_syslog("Prelevements effectues par ".$puser->fullname." [".PRELEVEMENT_USER."]"); dol_syslog("Raison sociale : ".PRELEVEMENT_RAISON_SOCIALE); -dol_syslog("Num�ro Nation Emetteur : ".PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR); +dol_syslog("Numero Nation Emetteur : ".PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR); dol_syslog("Code etablissement : ".PRELEVEMENT_CODE_BANQUE); dol_syslog("Code guichet : ". PRELEVEMENT_CODE_GUICHET); @@ -57,7 +57,7 @@ dol_syslog("Numero compte : ".PRELEVEMENT_NUMERO_COMPTE); /* * - * Lectures des factures a pr�lever + * Lectures des factures a prelever * */ @@ -93,7 +93,7 @@ if (!$error) $i++; } $db->free(); - dol_syslog("$i factures � pr�lever"); + dol_syslog("$i factures a prelever"); } else { @@ -105,18 +105,18 @@ if (!$error) /* * - * V�rification des clients + * Verification des clients * */ if (!$error) { /* - * V�rification des RIB + * Verification des RIB * */ $i = 0; - dol_syslog("D�but v�rification des RIB"); + dol_syslog("Debut verification des RIB"); if (sizeof($factures) > 0) { @@ -144,7 +144,7 @@ if (!$error) } else { - dol_syslog("Impossible de lire la soci�t�"); + dol_syslog("Impossible de lire la societe"); } } else @@ -159,7 +159,7 @@ if (!$error) } } -dol_syslog(sizeof($factures_prev)." factures sur ".sizeof($factures)." seront pr�lev�es"); +dol_syslog(sizeof($factures_prev)." factures sur ".sizeof($factures)." seront prelevees"); $db->close(); diff --git a/scripts/withdrawals/prelevement.php b/scripts/withdrawals/prelevement.php index 9b137e1d064..774b2b17107 100644 --- a/scripts/withdrawals/prelevement.php +++ b/scripts/withdrawals/prelevement.php @@ -27,7 +27,7 @@ // Test si mode CLI $sapi_type = php_sapi_name(); $script_file=__FILE__; -if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; +if (preg_match('/([^\\/]+)$/i',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; @@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { // Recupere env dolibarr $version='$Revision$'; -$path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); +$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]); require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/bon-prelevement.class.php"); @@ -95,7 +95,7 @@ if (!$error) $i++; } $db->free(); - dol_syslog("$i factures � prelever"); + dol_syslog("$i factures a prelever"); } else { @@ -114,7 +114,7 @@ if (!$error) if (!$error) { /* - * V�rification des RIB + * Verification des RIB * */ $i = 0; @@ -264,7 +264,7 @@ if (sizeof($factures_prev) > 0) $pai->amounts = array(); $pai->amounts[$fac[0]] = $fact->total_ttc; $pai->datepaye = $db->idate($datetimeprev); - $pai->paiementid = 3; // pr�l�vement + $pai->paiementid = 3; // prelevement $pai->num_paiement = $ref; if ($pai->create($user, 1) == -1) // on appelle en no_commit @@ -280,7 +280,7 @@ if (sizeof($factures_prev) > 0) $pai->valide(); /* - * Ajout d'une ligne de pr�l�vement + * Ajout d'une ligne de prelevement * * * $fac[3] : banque @@ -300,7 +300,7 @@ if (sizeof($factures_prev) > 0) } /* - * Mise � jour des demandes + * Mise a jour des demandes * */ $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande"; @@ -361,7 +361,7 @@ if (sizeof($factures_prev) > 0) } /* - * Mise � jour du total + * Mise a jour du total * */ @@ -373,7 +373,7 @@ if (sizeof($factures_prev) > 0) if (!$db->query($sql)) { $error++; - dol_syslog("Erreur mise � jour du total"); + dol_syslog("Erreur mise a jour du total"); dol_syslog($sql); } |