From 01291c4a7cb3d1218aaa9c12380184b1e7f989bd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 20 Oct 2009 13:14:44 +0000 Subject: [PATCH] Fix: function "split" is deprecated since php 5.3.0 --- dev/translation/langAutoParser.class.php | 4 ++-- htdocs/adherents/adherent.class.php | 2 +- htdocs/admin/dict.php | 12 ++++++------ htdocs/admin/modules.php | 2 +- htdocs/admin/tools/listevents.php | 2 +- htdocs/admin/triggers.php | 2 +- htdocs/boxes.php | 6 +++--- htdocs/categories/index.php | 4 ++-- htdocs/comm/mailing/fiche.php | 2 +- htdocs/compta/bank/annuel.php | 2 +- htdocs/compta/bank/graph.php | 2 +- htdocs/compta/facture.php | 6 +++--- htdocs/compta/facture/impayees.php | 6 +++--- htdocs/compta/sociales/index.php | 4 ++-- htdocs/contact.class.php | 2 +- htdocs/core/conf.class.php | 2 +- htdocs/ecm/index.php | 4 ++-- htdocs/exports/export.php | 2 +- htdocs/fourn/facture/impayees.php | 6 +++--- htdocs/fourn/facture/index.php | 4 ++-- htdocs/ftp/index.php | 2 +- htdocs/html.form.class.php | 2 +- htdocs/html.formadmin.class.php | 8 ++++---- htdocs/html.formmail.class.php | 18 +++++++++--------- htdocs/includes/fpdf/fpdf/fpdf.php | 2 +- .../pdf/pdf_expedition_merou.modules.php | 2 +- .../modules/export/export_csv.modules.php | 2 +- .../modules/export/export_excel.modules.php | 6 +++--- .../modules/export/export_tsv.modules.php | 2 +- .../modules/import/import_csv.modules.php | 2 +- .../modules/mailings/peche.modules.php | 2 +- .../nusoap/lib/class.soap_transport_http.php | 2 +- htdocs/includes/nusoap/lib/nusoap.php | 2 +- .../includes/php_excelreader/excel_reader2.php | 4 ++-- .../class.writeexcel_formula.inc.php | 14 +++++++------- .../class.writeexcel_worksheet.inc.php | 2 +- htdocs/includes/simplemail/class.mail.php | 2 +- htdocs/includes/smtps/SMTPs.php | 9 ++++++--- htdocs/install/check.php | 6 +++--- htdocs/install/etape2.php | 6 +++--- htdocs/install/etape5.php | 6 +++--- htdocs/install/upgrade.php | 2 +- htdocs/lib/CMailFile.class.php | 8 ++++---- htdocs/lib/admin.lib.php | 10 +++++----- htdocs/lib/company.lib.php | 2 +- htdocs/lib/databases/mssql.lib.php | 18 +++++++++--------- htdocs/lib/databases/mysql.lib.php | 6 +++--- htdocs/lib/databases/mysqli.lib.php | 6 +++--- htdocs/lib/databases/pgsql.lib.php | 6 +++--- htdocs/lib/fichinter.lib.php | 2 +- htdocs/lib/fourn.lib.php | 4 ++-- htdocs/lib/functions.lib.php | 4 ++-- htdocs/lib/functions2.lib.php | 2 +- htdocs/lib/invoice.lib.php | 2 +- htdocs/lib/member.lib.php | 4 ++-- htdocs/lib/order.lib.php | 2 +- htdocs/lib/product.lib.php | 2 +- htdocs/lib/propal.lib.php | 2 +- htdocs/lib/security.lib.php | 4 ++-- htdocs/main.inc.php | 10 +++++----- htdocs/master.inc.php | 4 ++-- htdocs/notify.class.php | 2 +- .../lib/class.soap_transport_http.php | 2 +- htdocs/oscommerce_ws/ws_server/lib/nusoap.php | 2 +- htdocs/projet/tasks/fiche.php | 2 +- htdocs/support/online.php | 4 ++-- htdocs/telephonie/script/api/presel-view.php | 4 ++-- .../script/commande_presel_statut.php | 10 +++++----- .../script/commande_presel_statut_view.php | 4 ++-- .../telephonie/script/presel_active_view.php | 4 ++-- htdocs/telephonie/script/presel_view.php | 4 ++-- htdocs/translate.class.php | 10 +++++----- htdocs/user.class.php | 2 +- htdocs/usergroup.class.php | 2 +- 74 files changed, 166 insertions(+), 163 deletions(-) diff --git a/dev/translation/langAutoParser.class.php b/dev/translation/langAutoParser.class.php index d867eefe26c..a33ea9fb30e 100644 --- a/dev/translation/langAutoParser.class.php +++ b/dev/translation/langAutoParser.class.php @@ -142,12 +142,12 @@ FILE_SKIP_EMPTY_LINES); private function getLineKey($line){ - $arraykey = split('=',$line,2); + $arraykey = explode('=',$line,2); return trim( $arraykey[0] ); } private function getLineValue($line){ - $arraykey = split('=',$line,2); + $arraykey = explode('=',$line,2); return trim( $arraykey[1] ); } diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php index f9ac39441f1..9c82a174e32 100644 --- a/htdocs/adherents/adherent.class.php +++ b/htdocs/adherents/adherent.class.php @@ -1944,7 +1944,7 @@ class Adherent extends CommonObject $info=array(); // Object classes - $info["objectclass"]=split(',',$conf->global->LDAP_MEMBER_OBJECT_CLASS); + $info["objectclass"]=explode(',',$conf->global->LDAP_MEMBER_OBJECT_CLASS); // Member if ($this->fullname && $conf->global->LDAP_MEMBER_FIELD_FULLNAME) $info[$conf->global->LDAP_MEMBER_FIELD_FULLNAME] = $this->fullname; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 8bc26515221..2e358869c15 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -241,10 +241,10 @@ $sortorder=$_GET["sortorder"]; */ if ($_POST["actionadd"] || $_POST["actionmodify"]) { - $listfield=split(',',$tabfield[$_POST["id"]]); - $listfieldinsert=split(',',$tabfieldinsert[$_POST["id"]]); - $listfieldmodify=split(',',$tabfieldinsert[$_POST["id"]]); - $listfieldvalue=split(',',$tabfieldvalue[$_POST["id"]]); + $listfield=explode(',',$tabfield[$_POST["id"]]); + $listfieldinsert=explode(',',$tabfieldinsert[$_POST["id"]]); + $listfieldmodify=explode(',',$tabfieldinsert[$_POST["id"]]); + $listfieldvalue=explode(',',$tabfieldvalue[$_POST["id"]]); // Check that all fields are filled $ok=1; @@ -493,7 +493,7 @@ if ($_GET["id"]) $sql.=$tabsqlsort[$_GET["id"]]; //print $sql; - $fieldlist=split(',',$tabfield[$_GET["id"]]); + $fieldlist=explode(',',$tabfield[$_GET["id"]]); print '
'; print ''; @@ -505,7 +505,7 @@ if ($_GET["id"]) $alabelisused=0; $var=false; - $fieldlist=split(',',$tabfield[$_GET["id"]]); + $fieldlist=explode(',',$tabfield[$_GET["id"]]); // print ''; // Line for title diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 855f5fae6ea..0596970156b 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -358,7 +358,7 @@ $familylib=array( ); foreach ($orders as $key => $value) { - $tab=split('_',$value); + $tab=explode('_',$value); $family=$tab[0]; $numero=$tab[1]; $modName = $filename[$key]; diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index a465456a168..16d53cbf6ae 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -188,7 +188,7 @@ if ($result) $text=$langs->trans($obj->description); if (eregi('\((.*)\)',$obj->description,$reg)) { - $val=split(',',$reg[1]); + $val=explode(',',$reg[1]); $text=$langs->trans($val[0], isset($val[1])?$val[1]:'', isset($val[2])?$val[2]:'', isset($val[3])?$val[3]:'', isset($val[4])?$val[4]:''); } print $text; diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index 409a93b463c..d8fe9fbab9f 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -170,7 +170,7 @@ $var=True; // Loop on each trigger foreach ($orders as $key => $value) { - $tab=split('_',$value); + $tab=explode('_',$value); $family=$tab[0]; $numero=$tab[1]; $modName = $modules[$key]; diff --git a/htdocs/boxes.php b/htdocs/boxes.php index 27e13388236..6c2f99c735c 100644 --- a/htdocs/boxes.php +++ b/htdocs/boxes.php @@ -203,16 +203,16 @@ class InfoBox $result = $this->db->query($sql); if ($result) { - $colonnes=split('-',$boxorder); + $colonnes=explode('-',$boxorder); foreach ($colonnes as $collist) { - $part=split(':',$collist); + $part=explode(':',$collist); $colonne=$part[0]; $list=$part[1]; dol_syslog('InfoBox::saveboxorder column='.$colonne.' list='.$list); $i=0; - $listarray=split(',',$list); + $listarray=explode(',',$list); foreach ($listarray as $id) { if (is_numeric($id)) diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index 21e05701d5b..f53bedcbcc0 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -164,12 +164,12 @@ foreach($fulltree as $key => $val) // Update expandedsectionarray in session $expandedsectionarray=array(); -if (isset($_SESSION['dol_catexpandedsectionarray'.$type])) $expandedsectionarray=split(',',$_SESSION['dol_catexpandedsectionarray'.$type]); +if (isset($_SESSION['dol_catexpandedsectionarray'.$type])) $expandedsectionarray=explode(',',$_SESSION['dol_catexpandedsectionarray'.$type]); if ($section && $_GET['sectionexpand'] == 'true') { // We add all sections that are parent of opened section - $pathtosection=split('_',$fullpathselected); + $pathtosection=explode('_',$fullpathselected); foreach($pathtosection as $idcursor) { if ($idcursor && ! in_array($idcursor,$expandedsectionarray)) // Not already in array diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 853bd789033..992b3b01b72 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -165,7 +165,7 @@ if ($_POST["action"] == 'sendallconfirmed' && $_POST['confirm'] == 'yes') $sendto = eregi_replace(',',' ',$obj->prenom." ".$obj->nom)." <".$obj->email.">"; // Make subtsitutions on topic and body - $other=split(';',$obj->other); + $other=explode(';',$obj->other); $other1=$other[0]; $other2=$other[1]; $other3=$other[2]; diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 39c1d3e6584..21938a88b4a 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -147,7 +147,7 @@ if ($_GET["account"]) else { $bankaccount=new Account($db); - $listid=split(',',$_GET["account"]); + $listid=explode(',',$_GET["account"]); foreach($listid as $key => $id) { $bankaccount->fetch($id); diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 2b1b623655b..8179c62440b 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -757,7 +757,7 @@ if ($account) else { $bankaccount=new Account($db); - $listid=split(',',$account); + $listid=explode(',',$account); foreach($listid as $key => $id) { $bankaccount->fetch($id); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index d09f6a360fa..15c345ef85e 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3659,10 +3659,10 @@ else if ($socid) $sql.= ' AND s.rowid = '.$socid; if ($_GET['filtre']) { - $filtrearr = split(',', $_GET['filtre']); + $filtrearr = explode(',', $_GET['filtre']); foreach ($filtrearr as $fil) { - $filt = split(':', $fil); + $filt = explode(':', $fil); $sql .= ' AND ' . trim($filt[0]) . ' = ' . trim($filt[1]); } } @@ -3705,7 +3705,7 @@ else $sql .= ' GROUP BY f.rowid'; $sql .= ' ORDER BY '; - $listfield=split(',',$sortfield); + $listfield=explode(',',$sortfield); foreach ($listfield as $key => $value) $sql.= $listfield[$key].' '.$sortorder.','; $sql .= ' f.rowid DESC '; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 49b241948e5..ee1acaf534d 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -183,10 +183,10 @@ if ($socid) $sql .= " AND s.rowid = ".$socid; if ($_GET["filtre"]) { - $filtrearr = split(",", $_GET["filtre"]); + $filtrearr = explode(",", $_GET["filtre"]); foreach ($filtrearr as $fil) { - $filt = split(":", $fil); + $filt = explode(":", $fil); $sql .= " AND " . $filt[0] . " = " . $filt[1]; } } @@ -218,7 +218,7 @@ if (strlen($_POST["sf_ref"]) > 0) $sql.= " GROUP BY f.facnumber"; $sql.= " ORDER BY "; -$listfield=split(',',$sortfield); +$listfield=explode(',',$sortfield); foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.","; $sql.= " f.facnumber DESC"; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 451a0e57e8e..61c31624d50 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -54,10 +54,10 @@ $offset = $limit * $page ; if (empty($_REQUEST['typeid'])) { $newfiltre=eregi_replace('filtre=','',$filtre); - $filterarray=split('-',$newfiltre); + $filterarray=explode('-',$newfiltre); foreach($filterarray as $val) { - $part=split(':',$val); + $part=explode(':',$val); if ($part[0] == 's.fk_type') $typeid=$part[1]; } } diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php index 65df934776e..dc806d6257d 100644 --- a/htdocs/contact.class.php +++ b/htdocs/contact.class.php @@ -248,7 +248,7 @@ class Contact extends CommonObject global $conf,$langs; // Object classes - $info["objectclass"]=split(',',$conf->global->LDAP_CONTACT_OBJECT_CLASS); + $info["objectclass"]=explode(',',$conf->global->LDAP_CONTACT_OBJECT_CLASS); // Champs if ($this->getFullName($langs) && $conf->global->LDAP_CONTACT_FIELD_FULLNAME) $info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->getFullName($langs); diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php index d60eb6fa863..3654703ef48 100644 --- a/htdocs/core/conf.class.php +++ b/htdocs/core/conf.class.php @@ -116,7 +116,7 @@ class Conf // If this is constant for a new tab page activated by a module if (eregi('^MAIN_MODULE_([A-Z_]+)_TABS_',$key) && $value) { - $params=split(':',$value,2); + $params=explode(':',$value,2); $this->tabs_modules[$params[0]][]=$value; //print 'xxx'.$params[0].'-'.$value; } diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 392e0686f1d..8154aeb7586 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -411,12 +411,12 @@ if (empty($action) || $action == 'file_manager' || eregi('refresh',$action) || $ // Update expandedsectionarray in session $expandedsectionarray=array(); - if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray=split(',',$_SESSION['dol_ecmexpandedsectionarray']); + if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray=explode(',',$_SESSION['dol_ecmexpandedsectionarray']); if ($section && $_GET['sectionexpand'] == 'true') { // We add all sections that are parent of opened section - $pathtosection=split('_',$fullpathselected); + $pathtosection=explode('_',$fullpathselected); foreach($pathtosection as $idcursor) { if ($idcursor && ! in_array($idcursor,$expandedsectionarray)) // Not already in array diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index bd3281d1f8d..4edd100c5b5 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -231,7 +231,7 @@ if ($step == 2 && $action == 'select_model') $result = $objexport->fetch($exportmodelid); if ($result > 0) { - $fieldsarray=split(',',$objexport->hexa); + $fieldsarray=explode(',',$objexport->hexa); $i=1; foreach($fieldsarray as $val) { diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 8afbce91d85..b31724f3d87 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -92,10 +92,10 @@ if ($user->rights->fournisseur->facture->lire) if ($_GET["filtre"]) { - $filtrearr = split(",", $_GET["filtre"]); + $filtrearr = explode(",", $_GET["filtre"]); foreach ($filtrearr as $fil) { - $filt = split(":", $fil); + $filt = explode(":", $fil); $sql .= " AND " . $filt[0] . " = " . $filt[1]; } } @@ -131,7 +131,7 @@ if ($user->rights->fournisseur->facture->lire) $sql.= " GROUP BY f.facnumber"; $sql.= " ORDER BY "; - $listfield=split(',',$sortfield); + $listfield=explode(',',$sortfield); foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.","; $sql.= " f.facnumber DESC"; diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index c1c886042e9..9344b377bf2 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -102,10 +102,10 @@ if ($socid) } if ($_GET["filtre"]) { - $filtrearr = split(",", $_GET["filtre"]); + $filtrearr = explode(",", $_GET["filtre"]); foreach ($filtrearr as $fil) { - $filt = split(":", $fil); + $filt = explode(":", $fil); $sql .= " AND " . $filt[0] . " = " . $filt[1]; } } diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index fa3cd458c21..e7bd93eba7a 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -395,7 +395,7 @@ else $i=0; while ($i < $nboflines && $i < 1000) { - $vals=split(' +',utf8_encode($buff[$i]),9); + $vals=explode(' +',utf8_encode($buff[$i]),9); $file=$vals[8]; if (empty($file)) diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index cbdbc580a54..9a4b0301464 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -1397,7 +1397,7 @@ class Form $filterarray=array(); if ($filtertype == 'CRDT') $filterarray=array(0,2); elseif ($filtertype == 'DBIT') $filterarray=array(1,2); - elseif ($filtertype != '' && $filtertype != '-1') $filterarray=split(',',$filtertype); + elseif ($filtertype != '' && $filtertype != '-1') $filterarray=explode(',',$filtertype); $this->load_cache_types_paiements(); diff --git a/htdocs/html.formadmin.class.php b/htdocs/html.formadmin.class.php index 15a1a8ac341..982285f3508 100644 --- a/htdocs/html.formadmin.class.php +++ b/htdocs/html.formadmin.class.php @@ -47,8 +47,8 @@ class FormAdmin /** - * \brief Retourne la liste déroulante des langues disponibles - * \param selected Langue pré-sélectionnée + * \brief Retourne la liste d�roulante des langues disponibles + * \param selected Langue pr�-s�lectionn�e * \param htmlname Nom de la zone select * \param showauto Affiche choix auto */ @@ -131,7 +131,7 @@ class FormAdmin $oldprefix=''; foreach ($menuarray as $key => $val) { - $tab=split('_',$key); + $tab=explode('_',$key); $newprefix=$tab[0]; if (! empty($conf->browser->firefox) && $newprefix != $oldprefix) // Add separators { @@ -179,7 +179,7 @@ class FormAdmin $oldprefix=''; foreach ($menuarray as $key => $val) { - $tab=split('_',$key); + $tab=explode('_',$key); $newprefix=$tab[0]; print '
'; foreach ($arrayofwidgets as $arraywidget) // Loop on each user { if ($found >= $limit) break; - $listofwidgets=split(',',$arraywidget['id']); - $listoflangs=split(',',$arraywidget['lang']); + $listofwidgets=explode(',',$arraywidget['id']); + $listoflangs=explode(',',$arraywidget['lang']); $pos=0; foreach($listoflangs as $langcode) // Loop on each lang of user { diff --git a/htdocs/telephonie/script/api/presel-view.php b/htdocs/telephonie/script/api/presel-view.php index b1cc0a9d1d3..63f36b9d2a8 100644 --- a/htdocs/telephonie/script/api/presel-view.php +++ b/htdocs/telephonie/script/api/presel-view.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ * - * Visualisation de l'etat des lignes preselectionnées + * Visualisation de l'etat des lignes preselectionn�es * */ require ("../../../master.inc.php"); @@ -113,7 +113,7 @@ function GetPreselection_byRef($db, $host, $user_login, $user_passwd, $ids, $deb } if (preg_match("//",$line)) { - $results = split(" ",trim($line)); + $results = explode(" ",trim($line)); //print_r($results); $array = array(); diff --git a/htdocs/telephonie/script/commande_presel_statut.php b/htdocs/telephonie/script/commande_presel_statut.php index 0b8cf4ab941..e9a314dd9e3 100644 --- a/htdocs/telephonie/script/commande_presel_statut.php +++ b/htdocs/telephonie/script/commande_presel_statut.php @@ -19,7 +19,7 @@ * $Source$ * * - * Recupération des fichiers CDR + * Recup�ration des fichiers CDR * */ require ("../../master.inc.php"); @@ -58,7 +58,7 @@ else if (sizeof($ids) == 0) { - _log($GLOBALS["argv"][0]. " Aucune lignes à traiter - fin", LOG_NOTICE); + _log($GLOBALS["argv"][0]. " Aucune lignes � traiter - fin", LOG_NOTICE); exit(0); } @@ -85,7 +85,7 @@ while ( $childrenNow < $childrenTotal ) } elseif ( $pid ) { - // Père + // P�re $childrenNow++; } else @@ -144,7 +144,7 @@ function GetPreselection_byRef($db, $host, $user_login, $user_passwd, $ids) if (preg_match("//",$line)) { - $results = split(" ",trim($line)); + $results = explode(" ",trim($line)); //print_r($results); $array = array(); @@ -300,7 +300,7 @@ function GetPreselection_byRef($db, $host, $user_login, $user_passwd, $ids) } else { - _log("$cli ERREUR impossible de récupérer les infos", LOG_ERR); + _log("$cli ERREUR impossible de r�cup�rer les infos", LOG_ERR); } _log("$cli Fin Traitement ligne", LOG_NOTICE); } diff --git a/htdocs/telephonie/script/commande_presel_statut_view.php b/htdocs/telephonie/script/commande_presel_statut_view.php index a7a8dd9d5bc..520747c8a47 100644 --- a/htdocs/telephonie/script/commande_presel_statut_view.php +++ b/htdocs/telephonie/script/commande_presel_statut_view.php @@ -19,7 +19,7 @@ * $Source$ * * - * Recupération des fichiers CDR + * Recup�ration des fichiers CDR * */ require ("../../master.inc.php"); @@ -96,7 +96,7 @@ function GetPreselection_byRef($db, $host, $user_login, $user_passwd, $ids) if (preg_match("//",$line)) { - $results = split(" ",trim($line)); + $results = explode(" ",trim($line)); //print_r($results); $array = array(); diff --git a/htdocs/telephonie/script/presel_active_view.php b/htdocs/telephonie/script/presel_active_view.php index eb1a2bd0842..50ee4a37999 100644 --- a/htdocs/telephonie/script/presel_active_view.php +++ b/htdocs/telephonie/script/presel_active_view.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ * - * Visualisation de l'etat des lignes preselectionnées + * Visualisation de l'etat des lignes preselectionn�es * */ require ("../../master.inc.php"); @@ -113,7 +113,7 @@ function GetPreselection_byRef($db, $host, $user_login, $user_passwd, $ids, $deb } if (preg_match("//",$line)) { - $results = split(" ",trim($line)); + $results = explode(" ",trim($line)); //print_r($results); $array = array(); diff --git a/htdocs/telephonie/script/presel_view.php b/htdocs/telephonie/script/presel_view.php index e3989a26c53..d2a553c9ced 100644 --- a/htdocs/telephonie/script/presel_view.php +++ b/htdocs/telephonie/script/presel_view.php @@ -18,7 +18,7 @@ * $Id$ * $Source$ * - * Visualisation de l'etat des lignes preselectionnées + * Visualisation de l'etat des lignes preselectionn�es * */ require ("../../master.inc.php"); @@ -109,7 +109,7 @@ function GetPreselection_byRef($db, $host, $user_login, $user_passwd, $ids, $deb } if (preg_match("//",$line)) { - $results = split(" ",trim($line)); + $results = explode(" ",trim($line)); //print_r($results); $array = array(); diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php index 88dd5b8e28e..2101055eae6 100644 --- a/htdocs/translate.class.php +++ b/htdocs/translate.class.php @@ -108,13 +108,13 @@ class Translate { $langpref=$_SERVER['HTTP_ACCEPT_LANGUAGE']; $langpref=eregi_replace(";[^,]*","",$langpref); $langpref=eregi_replace("-","_",$langpref); - $langlist=split("[;,]",$langpref); + $langlist=preg_split("/[;,]/",$langpref); $codetouse=$langlist[0]; } else $codetouse=$srclang; // We redefine $srclang - $langpart=split("_",$codetouse); + $langpart=explode("_",$codetouse); //print "Short before _ : ".$langpart[0].'/ Short after _ : '.$langpart[1]; if (isset($langpart[1])) // If its a long code xx_YY @@ -201,7 +201,7 @@ class Translate { //dol_syslog("Translate::Load langofdir=".$langofdir); // Redefine alt - $langarray=split('_',$langofdir); + $langarray=explode('_',$langofdir); if ($alt < 1 && strtolower($langarray[0]) == strtolower($langarray[1])) $alt=1; if ($alt < 2 && (strtolower($langofdir) == 'en_us' || strtolower($langofdir) == 'fr_fr' || strtolower($langofdir) == 'es_es')) $alt=2; @@ -243,7 +243,7 @@ class Translate { { if ($ligne[0] != "\n" && $ligne[0] != " " && $ligne[0] != "#") { - $tab=split('=',$ligne,2); + $tab=explode('=',$ligne,2); $key=trim($tab[0]); //print "Domain=$domain, found a string for $tab[0] with value $tab[1]
"; if (empty($this->tab_translate[$key]) && isset($tab[1])) @@ -589,7 +589,7 @@ class Translate { global $conf; $outlang=$this->defaultlang; // Output language we want - $outlangarray=split('_',$outlang,2); + $outlangarray=explode('_',$outlang,2); // If lang is xx_XX, then we use xx if (strtolower($outlangarray[0]) == strtolower($outlangarray[1])) $outlang=$outlangarray[0]; diff --git a/htdocs/user.class.php b/htdocs/user.class.php index 45d3663f749..03402e9367e 100644 --- a/htdocs/user.class.php +++ b/htdocs/user.class.php @@ -1598,7 +1598,7 @@ class User extends CommonObject $info=array(); // Object classes - $info["objectclass"]=split(',',$conf->global->LDAP_USER_OBJECT_CLASS); + $info["objectclass"]=explode(',',$conf->global->LDAP_USER_OBJECT_CLASS); // Champs if ($this->fullname && $conf->global->LDAP_FIELD_FULLNAME) $info[$conf->global->LDAP_FIELD_FULLNAME] = $this->fullname; diff --git a/htdocs/usergroup.class.php b/htdocs/usergroup.class.php index ca9ce0b3bb4..85de6598e8f 100644 --- a/htdocs/usergroup.class.php +++ b/htdocs/usergroup.class.php @@ -555,7 +555,7 @@ class UserGroup extends CommonObject $info=array(); // Object classes - $info["objectclass"]=split(',',$conf->global->LDAP_GROUP_OBJECT_CLASS); + $info["objectclass"]=explode(',',$conf->global->LDAP_GROUP_OBJECT_CLASS); // Champs if ($this->nom && $conf->global->LDAP_GROUP_FIELD_FULLNAME) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->nom;