Index: /trunk/phpgwapi/inc/class.net_http_client.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.net_http_client.inc.php (revision 2)
+++ /trunk/phpgwapi/inc/class.net_http_client.inc.php (revision 6057)
@@ -742,5 +742,5 @@
$finished = ( $str == $lastLine );
if ( !$finished ) {
- list( $hdr, $value ) = split( ": ", $str, 2 );
+ list( $hdr, $value ) = preg_split( '/: /', $str, 2 );
// nasty workaround broken multiple same headers (eg. Set-Cookie headers) @FIXME
if( isset( $headers[$hdr]) )
Index: /trunk/phpgwapi/inc/class.jscalendar.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.jscalendar.inc.php (revision 5934)
+++ /trunk/phpgwapi/inc/class.jscalendar.inc.php (revision 6057)
@@ -154,6 +154,6 @@
return False;
}
- $fields = split('[./-]',$datestr);
- foreach(split('[./-]',$this->dateformat) as $n => $field)
+ $fields = preg_split('/[./-]/',$datestr);
+ foreach(preg_split('/[./-]/',$this->dateformat) as $n => $field)
{
if ($field == 'M')
Index: /trunk/phpgwapi/inc/class.contacts_ldap.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.contacts_ldap.inc.php (revision 2)
+++ /trunk/phpgwapi/inc/class.contacts_ldap.inc.php (revision 6057)
@@ -324,5 +324,5 @@
{
if($DEBUG) { echo 'DEBUG - Inbound filter is: #'.$filter.'#'; }
- $filterarray = split(',',$filter);
+ $filterarray = preg_split('/,/',$filter);
if($filterarray[1])
{
@@ -340,5 +340,5 @@
else
{
- list($name,$value) = split('=',$filter);
+ list($name,$value) = preg_split('/=/',$filter);
if($DEBUG)
{
@@ -547,5 +547,5 @@
elseif($extra)
{
- $tmp = split('=',$extra);
+ $tmp = preg_split('/=/',$extra);
$qarray[] = array($tmp[0] => $tmp[1]);
}
@@ -863,5 +863,5 @@
/* Verify uid */
- $uids = split(',',$dn);
+ $uids = preg_split('/,/',$dn);
$stock_fields['lid'] = $uids[0];
if(empty($ldap_fields[0]['uid']))
Index: /trunk/phpgwapi/inc/class.vfs_shared.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.vfs_shared.inc.php (revision 5940)
+++ /trunk/phpgwapi/inc/class.vfs_shared.inc.php (revision 6057)
@@ -797,5 +797,5 @@
if (!preg_match('/^#/',$contents[$i]))
{
- $line=split("[[:space:]]+", $contents[$i]);
+ $line=preg_split('/[[:space:]]+/', $contents[$i]);
if (sizeof($line) >= 2)
{
Index: /trunk/phpgwapi/inc/class.asyncservice.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.asyncservice.inc.php (revision 5141)
+++ /trunk/phpgwapi/inc/class.asyncservice.inc.php (revision 6057)
@@ -634,5 +634,5 @@
{
if ($this->debug) echo 'line '.++$n.": $line
\n";
- $parts = split(' ',$line,6);
+ $parts = preg_split('/ /',$line,6);
// Foi customizado para a Celepar.
Index: /trunk/phpgwapi/inc/class.vcard.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.vcard.inc.php (revision 5934)
+++ /trunk/phpgwapi/inc/class.vcard.inc.php (revision 6057)
@@ -123,5 +123,5 @@
while($data = fgets($fp,8000))
{
- list($name,$value,$extra) = split(':', $data);
+ list($name,$value,$extra) = preg_split('/:/', $data);
if(substr($value,0,5) == 'http')
{
@@ -216,10 +216,10 @@
foreach($buffer as $name => $value)
{
- $field = split(';',$name);
+ $field = preg_split('/;/',$name);
$field[0] = preg_replace('/A\./','',$field[0]);
$field[0] = preg_replace('/B\./','',$field[0]);
$field[0] = preg_replace('/C\./','',$field[0]);
$field[0] = preg_replace('/D\./','',$field[0]);
- $values = split(';',$value);
+ $values = preg_split('/;/',$value);
if($field[1])
{
@@ -594,5 +594,5 @@
else
{
- $tmp = split('-',$values[0]);
+ $tmp = preg_split('/-/',$values[0]);
if($tmp[0])
{
@@ -612,5 +612,5 @@
$entry['adr_two_type'] = substr($buffer['adr_two_type'],0,-1);
- if(count($street = split("\r*\n",$buffer['adr_one_street'],3)) > 1)
+ if(count($street = preg_split('/\r*\n/',$buffer['adr_one_street'],3)) > 1)
{
$entry['adr_one_street'] = $street[0]; // RB 2001/05/08 added for Lotus Organizer to split multiline adresses
@@ -650,5 +650,5 @@
elseif($value == 'BDAY')
{
- $tmp = split('/',$buffer[$value]); # 12/31/1969 -> 1969-12-31
+ $tmp = preg_split('/\//',$buffer[$value]); # 12/31/1969 -> 1969-12-31
if($tmp[0])
{
Index: /trunk/phpgwapi/inc/adodb/adodb-datadict.inc.php
===================================================================
--- /trunk/phpgwapi/inc/adodb/adodb-datadict.inc.php (revision 34)
+++ /trunk/phpgwapi/inc/adodb/adodb-datadict.inc.php (revision 6057)
@@ -519,5 +519,5 @@
if ($lines == null) $lines = array();
list(,$first) = each($lines);
- list(,$column_def) = split("[\t ]+",$first,2);
+ list(,$column_def) = preg_split('/[\t ]+/',$first,2);
}
return array(sprintf($this->renameColumn,$tabname,$this->NameQuote($oldcolumn),$this->NameQuote($newcolumn),$column_def));
Index: /trunk/phpgwapi/inc/adodb/session/adodb-session.php
===================================================================
--- /trunk/phpgwapi/inc/adodb/session/adodb-session.php (revision 1057)
+++ /trunk/phpgwapi/inc/adodb/session/adodb-session.php (revision 6057)
@@ -47,5 +47,5 @@
{
$variables = array( );
- $a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
+ $a = preg_split( '/(\w+)\|/', $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
for( $i = 0; $i < count( $a ); $i = $i+2 ) {
$variables[$a[$i]] = unserialize( $a[$i+1] );
Index: /trunk/phpgwapi/inc/adodb/session/adodb-session2.php
===================================================================
--- /trunk/phpgwapi/inc/adodb/session/adodb-session2.php (revision 34)
+++ /trunk/phpgwapi/inc/adodb/session/adodb-session2.php (revision 6057)
@@ -77,5 +77,5 @@
{
$variables = array( );
- $a = preg_split( "/(\w+)\|/", $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
+ $a = preg_split( '/(\w+)\|/', $serialized_string, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
for( $i = 0; $i < count( $a ); $i = $i+2 ) {
$variables[$a[$i]] = unserialize( $a[$i+1] );
Index: /trunk/phpgwapi/inc/adodb/adodb-perf.inc.php
===================================================================
--- /trunk/phpgwapi/inc/adodb/adodb-perf.inc.php (revision 34)
+++ /trunk/phpgwapi/inc/adodb/adodb-perf.inc.php (revision 6057)
@@ -88,8 +88,8 @@
$dbT = $conn->databaseType;
- $a0 = split(' ',$t0);
+ $a0 = preg_split('/ /',$t0);
$a0 = (float)$a0[1]+(float)$a0[0];
- $a1 = split(' ',$t1);
+ $a1 = preg_split('/ /',$t1);
$a1 = (float)$a1[1]+(float)$a1[0];
Index: /trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- /trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php (revision 34)
+++ /trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php (revision 6057)
@@ -56,5 +56,5 @@
if ( strstr( $host, ':' ) ) {
- $conn_info = split( ':', $host );
+ $conn_info = preg_split( '/:/', $host );
}
Index: /trunk/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- /trunk/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php (revision 34)
+++ /trunk/phpgwapi/inc/adodb/drivers/adodb-informix72.inc.php (revision 6057)
@@ -370,5 +370,5 @@
$o = new ADOFieldObject;
$o->name = $k;
- $arr = split(';',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
+ $arr = preg_split('/;/',$v); //"SQLTYPE;length;precision;scale;ISNULLABLE"
$o->type = $arr[0];
$o->max_length = $arr[1];
Index: /trunk/phpgwapi/inc/common_functions.inc.php
===================================================================
--- /trunk/phpgwapi/inc/common_functions.inc.php (revision 5928)
+++ /trunk/phpgwapi/inc/common_functions.inc.php (revision 6057)
@@ -341,5 +341,5 @@
if (preg_match('/^[0-9]{1,3}(\.[0-9]{1,3}){3}$/i',$string))
{
- $octets = split('\.',$string);
+ $octets = preg_split('/\./',$string);
for ($i=0; $i != count($octets); $i++)
{
Index: /trunk/phpgwapi/inc/class.xmlrpcmsg.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.xmlrpcmsg.inc.php (revision 5912)
+++ /trunk/phpgwapi/inc/class.xmlrpcmsg.inc.php (revision 6057)
@@ -243,5 +243,5 @@
}
}
- $r->hdrs = $GLOBALS['_xh'][$parser]['ha']; //split("\r?\n", $GLOBALS['_xh'][$parser]['ha'][1]);
+ $r->hdrs = $GLOBALS['_xh'][$parser]['ha']; //preg_split('/\r?\n/', $GLOBALS['_xh'][$parser]['ha'][1]);
return $r;
}
Index: /trunk/phpgwapi/inc/class.vfs_sql.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.vfs_sql.inc.php (revision 5940)
+++ /trunk/phpgwapi/inc/class.vfs_sql.inc.php (revision 6057)
@@ -331,5 +331,5 @@
if ($attribute == 'version' && $data['incversion'])
{
- $version_parts = split ("\.", $value);
+ $version_parts = preg_split('/\./', $value);
$newnumofparts = $numofparts = count ($version_parts);
Index: /trunk/phpgwapi/inc/xml_functions.inc.php
===================================================================
--- /trunk/phpgwapi/inc/xml_functions.inc.php (revision 5934)
+++ /trunk/phpgwapi/inc/xml_functions.inc.php (revision 6057)
@@ -146,5 +146,5 @@
function xmlrpc_entity_decode($string)
{
- $top = split('&', $string);
+ $top = preg_split('/&/', $string);
$op = '';
$i = 0;
Index: /trunk/phpgwapi/inc/class.send.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.send.inc.php (revision 2)
+++ /trunk/phpgwapi/inc/class.send.inc.php (revision 6057)
@@ -124,5 +124,5 @@
else
{
- $addresses = split('[, ]',$$adr);
+ $addresses = preg_split('/[, ]/',$$adr);
$names = array();
}
Index: /trunk/phpgwapi/inc/class.xmlrpc_server.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.xmlrpc_server.inc.php (revision 2)
+++ /trunk/phpgwapi/inc/class.xmlrpc_server.inc.php (revision 6057)
@@ -47,5 +47,5 @@
function iso86012date($isodate,$timestamp=False)
{
- if (($arr = split('[-:T]',$isodate)) && count($arr) == 6)
+ if (($arr = preg_split('/[-:T]/',$isodate)) && count($arr) == 6)
{
foreach(array('year','month','mday','hour','min','sec') as $n => $name)
Index: /trunk/phpgwapi/inc/class.vfs_dav.inc.php
===================================================================
--- /trunk/phpgwapi/inc/class.vfs_dav.inc.php (revision 5940)
+++ /trunk/phpgwapi/inc/class.vfs_dav.inc.php (revision 6057)
@@ -2374,5 +2374,5 @@
if (!preg_match('/^#/',$contents[$i]))
{
- $line=split("[[:space:]]+", $contents[$i]);
+ $line=preg_split('/[[:space:]]+/', $contents[$i]);
if (sizeof($line) >= 2)
{
Index: /trunk/reports/inc/class.functions.inc.php
===================================================================
--- /trunk/reports/inc/class.functions.inc.php (revision 5291)
+++ /trunk/reports/inc/class.functions.inc.php (revision 6057)
@@ -119,5 +119,5 @@
$result['raw_context'] = $acl[0]['context'];
- $all_contexts = split("%", $acl[0]['context']);
+ $all_contexts = preg_split('/%/', $acl[0]['context']);
foreach ($all_contexts as $index=>$context)
{
@@ -1071,5 +1071,5 @@
function make_lang($ram_lang)
{
- $a_lang = split("_", $ram_lang);
+ $a_lang = preg_split('/_/', $ram_lang);
$a_lang_reverse = array_reverse ( $a_lang, true );
array_pop ( $a_lang_reverse );
Index: /trunk/library/PEAR/PEAR/RunTest.php
===================================================================
--- /trunk/library/PEAR/PEAR/RunTest.php (revision 5146)
+++ /trunk/library/PEAR/PEAR/RunTest.php (revision 6057)
@@ -320,5 +320,5 @@
$section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
}
- $ini = preg_split( "/[\n\r]+/", $section_text['INI']);
+ $ini = preg_split( '/[\n\r]+/', $section_text['INI']);
$ini_settings = $this->settings2array($ini, $ini_settings);
}
@@ -804,5 +804,5 @@
{
$headers = array();
- $rh = preg_split("/[\n\r]+/", $text);
+ $rh = preg_split('/[\n\r]+/', $text);
foreach ($rh as $line) {
if (strpos($line, ':')!== false) {
Index: /trunk/library/mime/mimeDecode.php
===================================================================
--- /trunk/library/mime/mimeDecode.php (revision 4414)
+++ /trunk/library/mime/mimeDecode.php (revision 6057)
@@ -665,5 +665,5 @@
$boundary = $bs_possible;
}
- $tmp = preg_split("/--".preg_quote($boundary, '/')."((?=\s)|--)/", $input);
+ $tmp = preg_split('/\/--/'.preg_quote($boundary, '/')."((?=\s)|--)/", $input);
$len = count($tmp) -1;
@@ -799,5 +799,5 @@
$file = '';
- $str = preg_split("/\r?\n/", trim($str));
+ $str = preg_split('/\r?\n/', trim($str));
$strlen = count($str);
Index: /trunk/library/mime/mimePart.php
===================================================================
--- /trunk/library/mime/mimePart.php (revision 5135)
+++ /trunk/library/mime/mimePart.php (revision 6057)
@@ -570,5 +570,5 @@
}
*/
- $lines = preg_split("/\r?\n/", $input);
+ $lines = preg_split('/\r?\n/', $input);
$escape = '=';
$output = '';
Index: /trunk/mobile/inc/class.ui_mobilecalendar.inc.php
===================================================================
--- /trunk/mobile/inc/class.ui_mobilecalendar.inc.php (revision 4277)
+++ /trunk/mobile/inc/class.ui_mobilecalendar.inc.php (revision 6057)
@@ -146,13 +146,13 @@
//descobrindo a semana anterior e a pŽroxima
$last_week = date("d-m-Y", strtotime("-7 day", mktime(0,0,0,$month,$day,$year) ) );
- $last_week = split("-",$last_week);
+ $last_week = preg_split('/-/',$last_week);
$next_week = date("d-m-Y", strtotime("+7 day", mktime(0,0,0,$month,$day,$year) ) );
- $next_week = split("-",$next_week);
+ $next_week = preg_split('/-/',$next_week);
//descobrind o primeiro dia da semana e o último
$first_week_day = date("d-m-Y", strtotime("-".$current_day_of_week." day", mktime(0,0,0,$month,$day,$year) ) );
- $first_week_day = split("-",$first_week_day);
+ $first_week_day = preg_split('/-/',$first_week_day);
$last_week_day = date("d-m-Y", strtotime("+".(6-$current_day_of_week)." day", mktime(0,0,0,$month,$day,$year) ) );
- $last_week_day = split("-",$last_week_day);
+ $last_week_day = preg_split('/-/',$last_week_day);
//definindo a barra de navegação do calandário
@@ -196,7 +196,7 @@
$last_day_of_before_month = date('t', mktime(0,0,0,$month-1,"01",$year));
$last_month_year = date("m-Y", strtotime("-1 month", mktime(0,0,0,$month,"01",$year) ) );
- $last_month_year = split("-",$last_month_year);
+ $last_month_year = preg_split('/-/',$last_month_year);
$next_month_year = date("m-Y", strtotime("+1 month", mktime(0,0,0,$month,"01",$year) ) );
- $next_month_year = split("-",$next_month_year);
+ $next_month_year = preg_split('/-/',$next_month_year);
$today = date("d-m-Y");
@@ -285,7 +285,7 @@
//descobrind o primeiro dia da semana e o último
$before_day = date("d-m-Y", strtotime("-1 day", mktime(0,0,0,$month,$day,$year) ) );
- $before_day = split("-",$before_day);
+ $before_day = preg_split('/-/',$before_day);
$next_day = date("d-m-Y", strtotime("+1 day", mktime(0,0,0,$month,$day,$year) ) );
- $next_day = split("-",$next_day);
+ $next_day = preg_split('/-/',$next_day);
//definindo a barra de navegação do calandário
Index: /trunk/filemanager/tp/dompdf/dompdf.php
===================================================================
--- /trunk/filemanager/tp/dompdf/dompdf.php (revision 3019)
+++ /trunk/filemanager/tp/dompdf/dompdf.php (revision 6057)
@@ -229,5 +229,5 @@
if ( isset($opts['t']) ) {
- $arr = split(',',$opts['t']);
+ $arr = preg_split('/,/',$opts['t']);
$types = array();
foreach ($arr as $type)
Index: /trunk/filemanager/tp/dompdf/include/dompdf.cls.php
===================================================================
--- /trunk/filemanager/tp/dompdf/include/dompdf.cls.php (revision 3019)
+++ /trunk/filemanager/tp/dompdf/include/dompdf.cls.php (revision 6057)
@@ -363,5 +363,5 @@
//Check if the css file is for an accepted media type
//media not given then always valid
- $formedialist = preg_split("/[\s\n,]/", $link->getAttribute("media"),-1, PREG_SPLIT_NO_EMPTY);
+ $formedialist = preg_split('/[\s\n,]/', $link->getAttribute("media"),-1, PREG_SPLIT_NO_EMPTY);
if ( count($formedialist) > 0 ) {
$accept = false;
Index: /trunk/filemanager/tp/dompdf/include/stylesheet.cls.php
===================================================================
--- /trunk/filemanager/tp/dompdf/include/stylesheet.cls.php (revision 3019)
+++ /trunk/filemanager/tp/dompdf/include/stylesheet.cls.php (revision 6057)
@@ -357,5 +357,5 @@
// Parse the selector
- //$s = preg_split("/([ :>.#+])/", $selector, -1, PREG_SPLIT_DELIM_CAPTURE);
+ //$s = preg_split('/([ :>.#+])/', $selector, -1, PREG_SPLIT_DELIM_CAPTURE);
$delimiters = array(" ", ">", ".", "#", "+", ":", "[");
@@ -883,5 +883,5 @@
*/
private function _parse_import($url) {
- $arr = preg_split("/[\s\n,]/", $url,-1, PREG_SPLIT_NO_EMPTY);
+ $arr = preg_split('/[\s\n,]/', $url,-1, PREG_SPLIT_NO_EMPTY);
$url = array_shift($arr);
$accept = false;
Index: /trunk/filemanager/tp/dompdf/include/text_frame_reflower.cls.php
===================================================================
--- /trunk/filemanager/tp/dompdf/include/text_frame_reflower.cls.php (revision 3019)
+++ /trunk/filemanager/tp/dompdf/include/text_frame_reflower.cls.php (revision 6057)
@@ -363,5 +363,5 @@
// faster than doing a single-pass character by character scan. Heh,
// yes I took the time to bench it ;)
- $words = array_flip(preg_split("/[\s-]+/u",$str, -1, PREG_SPLIT_DELIM_CAPTURE));
+ $words = array_flip(preg_split('/[\s-]+/u',$str, -1, PREG_SPLIT_DELIM_CAPTURE));
array_walk($words, create_function('&$val,$str',
'$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
@@ -371,5 +371,5 @@
case "pre":
- $lines = array_flip(preg_split("/\n/u", $str));
+ $lines = array_flip(preg_split('/\n/u', $str));
array_walk($lines, create_function('&$val,$str',
'$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
@@ -398,5 +398,5 @@
case "pre-wrap":
// Find the longest word (i.e. minimum length)
- $lines = array_flip(preg_split("/\n/", $text));
+ $lines = array_flip(preg_split('/\n/', $text));
array_walk($lines, create_function('&$val,$str',
'$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
Index: /trunk/filemanager/tp/dompdf/include/block_frame_decorator.cls.php
===================================================================
--- /trunk/filemanager/tp/dompdf/include/block_frame_decorator.cls.php (revision 3019)
+++ /trunk/filemanager/tp/dompdf/include/block_frame_decorator.cls.php (revision 6057)
@@ -186,5 +186,5 @@
if ( $frame->get_node()->nodeName == "#text")
- $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+ $this->_lines[$this->_cl]["wc"] += count(preg_split('/\s+/', $frame->get_text()));
$this->_lines[$this->_cl]["w"] += $w;
Index: /trunk/listAdmin/inc/class.functions.inc.php
===================================================================
--- /trunk/listAdmin/inc/class.functions.inc.php (revision 3514)
+++ /trunk/listAdmin/inc/class.functions.inc.php (revision 6057)
@@ -398,5 +398,5 @@
$first_sector_ufn = ldap_dn2ufn($context);
- $first_sector_string = split(",", $first_sector_ufn);
+ $first_sector_string = preg_split('/,/', $first_sector_ufn);
$s = CreateObject('phpgwapi.sector_search_ldap');
@@ -503,5 +503,5 @@
// Cria a primeira entrada na combo
$first_sector_ufn = ldap_dn2ufn($context);
- $first_sector_string = split(",", $first_sector_ufn);
+ $first_sector_string = preg_split('/,/', $first_sector_ufn);
$options = "" . $options;
Index: /trunk/listAdmin/inc/sieve-php.lib.php
===================================================================
--- /trunk/listAdmin/inc/sieve-php.lib.php (revision 5912)
+++ /trunk/listAdmin/inc/sieve-php.lib.php (revision 6057)
@@ -121,5 +121,5 @@
$this->line=fgets($this->fp,1024);
- $this->token = split(" ", $this->line, 2);
+ $this->token = preg_split('/ /', $this->line, 2);
if($this->token[0] == "NO"){
@@ -127,5 +127,5 @@
NO ("yyyyy") "zzzzzzz" or, two, NO {yyyyy} "zzzzzzzzzzz" */
$this->x = 0;
- list($this->ltoken, $this->mtoken, $this->rtoken) = split(" ", $this->line." ", 3);
+ list($this->ltoken, $this->mtoken, $this->rtoken) = preg_split('/ /', $this->line." ", 3);
if($this->mtoken[0] == "{"){
while($this->mtoken[$this->x] != "}" or $this->err_len < 1){
@@ -389,5 +389,5 @@
$this->cap_type="auth";
- $this->modules = split(" ", $this->item[1]);
+ $this->modules = preg_split('/ /', $this->item[1]);
if(is_array($this->modules)){
foreach($this->modules as $this->module)
@@ -422,5 +422,5 @@
//then split again at the ", " stuff.
- $this->modules = split($this->modules, ", ");
+ $this->modules = preg_split("/$this->modules/", ", ");
//fill up our $this->modules property
@@ -784,5 +784,5 @@
$this->cap_type="auth";
- $this->modules = split(" ", $this->item[1]);
+ $this->modules = preg_split('/ /', $this->item[1]);
if(is_array($this->modules)){
foreach($this->modules as $this->module)
@@ -814,5 +814,5 @@
//then split again at the ", " stuff.
- $this->modules = split($this->modules, ", ");
+ $this->modules = preg_split("/$this->modules/", ", ");
//fill up our $this->modules property
Index: /trunk/admin/inc/class.uicategories.inc.php
===================================================================
--- /trunk/admin/inc/class.uicategories.inc.php (revision 3536)
+++ /trunk/admin/inc/class.uicategories.inc.php (revision 6057)
@@ -345,5 +345,5 @@
function edit()
{
- $cat_group = split(",",$_POST['idgroup']);
+ $cat_group = preg_split('/,/',$_POST['idgroup']);
if (count($cat_group) == 0)
Index: /trunk/admin/inc/class.boaccess_history.inc.php
===================================================================
--- /trunk/admin/inc/class.boaccess_history.inc.php (revision 5912)
+++ /trunk/admin/inc/class.boaccess_history.inc.php (revision 6057)
@@ -56,5 +56,5 @@
if (preg_match('/@/',$record['loginid']))
{
- $t = split('@',$record['loginid']);
+ $t = preg_split('/@/',$record['loginid']);
$record['loginid'] = $t[0];
}
Index: /trunk/admin/inc/class.bocurrentsessions.inc.php
===================================================================
--- /trunk/admin/inc/class.bocurrentsessions.inc.php (revision 5912)
+++ /trunk/admin/inc/class.bocurrentsessions.inc.php (revision 6057)
@@ -33,5 +33,5 @@
if (preg_match('/@/',$value['session_lid']))
{
- $t = split('@',$value['session_lid']);
+ $t = preg_split('/@/',$value['session_lid']);
$session_lid = $t[0];
}
Index: /trunk/admin/inc/Controller.class.php
===================================================================
--- /trunk/admin/inc/Controller.class.php (revision 5509)
+++ /trunk/admin/inc/Controller.class.php (revision 6057)
@@ -457,5 +457,5 @@
// convert from a string to an array
ksort($keywords['sorted']);
- $keywords = "'" . implode('|',$keywords['sorted']) . "'.split('|')";
+ $keywords = "'" . implode('|',$keywords['sorted']) . "'.preg_split('/|/')";
$encode = ($this->_encoding > 62) ? '_encode95' : $this->_getEncoder($ascii);
Index: /trunk/setup/lang.php
===================================================================
--- /trunk/setup/lang.php (revision 2)
+++ /trunk/setup/lang.php (revision 6057)
@@ -103,5 +103,5 @@
{
_debug_array($badline);
- $_f_buffer = split("[/\\]", $badline['appfile']);
+ $_f_buffer = preg_split('/[\/\\]/', $badline['appfile']);
$str .= lang('Application: %1, File: %2, Line: "%3"',''.$_f_buffer[count($_f_buffer)-3].'',
''.$_f_buffer[count($_f_buffer)-1].'',$badline['line'])."
\n";
Index: /trunk/about.php
===================================================================
--- /trunk/about.php (revision 162)
+++ /trunk/about.php (revision 6057)
@@ -67,5 +67,5 @@
{
$names = explode('
',$infos['name']);
- $emails = split('@|
',$infos['email']);
+ $emails = preg_split('/@|
/',$infos['email']);
if (count($names) < count($emails)/2)
{
Index: /trunk/preferences/inc/class.uiaclprefs.inc.php
===================================================================
--- /trunk/preferences/inc/class.uiaclprefs.inc.php (revision 3404)
+++ /trunk/preferences/inc/class.uiaclprefs.inc.php (revision 6057)
@@ -130,5 +130,5 @@
$totalacl = array();
while(list($rowinfo,$perm) = each($group_variable)) {
- list($group_id,$rights) = split('_',$rowinfo);
+ list($group_id,$rights) = preg_split('/_/',$rowinfo);
$totalacl[$group_id] += $rights;
}
@@ -153,5 +153,5 @@
$totalacl = array();
while(list($rowinfo,$perm) = each($user_variable)) {
- list($user_id,$rights) = split('_',$rowinfo);
+ list($user_id,$rights) = preg_split('/_/',$rowinfo);
$totalacl[$user_id] += $rights;
}
Index: /trunk/expressoCalendar/inc/class.ui_migration.inc.php
===================================================================
--- /trunk/expressoCalendar/inc/class.ui_migration.inc.php (revision 5804)
+++ /trunk/expressoCalendar/inc/class.ui_migration.inc.php (revision 6057)
@@ -107,5 +107,5 @@
//time
- $time = split (":", $result['times']);
+ $time = preg_split('/:/', $result['times']);
$sql_insert .= substr($time, -1).", ";
//range_end
@@ -160,5 +160,5 @@
//participantes externos normais
} catch (Exception $e) {
- $participants_ex = split(',', $ex_participante);
+ $participants_ex = preg_split('/,/', $ex_participante);
foreach ($participants_ex as $ex){
Index: /trunk/prototype/plugins/davicalCliente/caldav-client-v2.php
===================================================================
--- /trunk/prototype/plugins/davicalCliente/caldav-client-v2.php (revision 5437)
+++ /trunk/prototype/plugins/davicalCliente/caldav-client-v2.php (revision 6057)
@@ -279,5 +279,5 @@
fclose($fip);
- list( $this->httpResponseHeaders, $this->httpResponseBody ) = preg_split( '{\r?\n\r?\n}s', $response, 2 );
+ list( $this->httpResponseHeaders, $this->httpResponseBody ) = preg_split( '/{\r?\n\r?\n}s/', $response, 2 );
if ( preg_match( '{Transfer-Encoding: chunked}i', $this->httpResponseHeaders ) ) $this->Unchunk();
Index: /trunk/calendar/inc/class.boicalendar.inc.php
===================================================================
--- /trunk/calendar/inc/class.boicalendar.inc.php (revision 6037)
+++ /trunk/calendar/inc/class.boicalendar.inc.php (revision 6057)
@@ -2376,5 +2376,5 @@
// Split DURATION
- list ($_f_['day_raw'], $_f_['time_raw']) = split('T', substr($value, 1, strlen($value) - 1));
+ list ($_f_['day_raw'], $_f_['time_raw']) = preg_split('/T/', substr($value, 1, strlen($value) - 1));
/* Datecode */
@@ -2960,5 +2960,5 @@
// What is datetime in 2192 ?
$enddate = strtotime($pdate, $ptimer);
- list ($recur_enddate['year'], $recur_enddate['month'], $recur_enddate['mday'], $recur_enddate['hour'], $recur_enddate['min'], $recur_enddate['sec']) = split(":", date("Y:m:d:H:i:s", $enddate));
+ list ($recur_enddate['year'], $recur_enddate['month'], $recur_enddate['mday'], $recur_enddate['hour'], $recur_enddate['min'], $recur_enddate['sec']) = preg_split('/:/', date("Y:m:d:H:i:s", $enddate));
// Set End of event
Index: /trunk/calendar/inc/class.uicalendar.inc.php
===================================================================
--- /trunk/calendar/inc/class.uicalendar.inc.php (revision 5921)
+++ /trunk/calendar/inc/class.uicalendar.inc.php (revision 6057)
@@ -5725,5 +5725,5 @@
if(isset($_GET['part']) && $_GET['part'])
{
- $control_data['part'] = split(",", $_GET['part']);
+ $control_data['part'] = preg_split('/,/', $_GET['part']);
}
else
Index: /trunk/calendar/inc/class.socalendar.inc.php
===================================================================
--- /trunk/calendar/inc/class.socalendar.inc.php (revision 5132)
+++ /trunk/calendar/inc/class.socalendar.inc.php (revision 6057)
@@ -157,5 +157,5 @@
'(phpgw_cal_user.cal_login=' . (int)$this->owner . ' OR phpgw_cal.is_public=1) AND (';
- $words = split(' ',$keywords);
+ $words = preg_split('/ /',$keywords);
foreach($words as $i => $word)
{
Index: /trunk/calendar/csv_import.php
===================================================================
--- /trunk/calendar/csv_import.php (revision 5934)
+++ /trunk/calendar/csv_import.php (revision 6057)
@@ -93,5 +93,5 @@
}
- $cats = split('[,;]',$cats);
+ $cats = preg_split('/[,;]/',$cats);
foreach($cats as $k => $cat)
@@ -473,5 +473,5 @@
// convert participants-names to user-id's
$participants = 0;
- foreach(split('[,;]',$values['participants']) as $part_status)
+ foreach(preg_split('/[,;]/',$values['participants']) as $part_status)
{
list($part,$status) = explode('=',$part_status);
Index: /trunk/workflow/inc/smarty/plugins/function.fetch.php
===================================================================
--- /trunk/workflow/inc/smarty/plugins/function.fetch.php (revision 795)
+++ /trunk/workflow/inc/smarty/plugins/function.fetch.php (revision 6057)
@@ -182,10 +182,10 @@
}
fclose($fp);
- $csplit = split("\r\n\r\n",$content,2);
+ $csplit = preg_split('/\r\n\r\n/',$content,2);
$content = $csplit[1];
if(!empty($params['assign_headers'])) {
- $smarty->assign($params['assign_headers'],split("\r\n",$csplit[0]));
+ $smarty->assign($params['assign_headers'],preg_split('/\r\n/',$csplit[0]));
}
}
Index: /trunk/workflow/inc/phplot/phplot.php
===================================================================
--- /trunk/workflow/inc/phplot/phplot.php (revision 5934)
+++ /trunk/workflow/inc/phplot/phplot.php (revision 6057)
@@ -942,5 +942,5 @@
// Split the text by its lines, and count them
$which_text = preg_replace('/\r/', '', $which_text);
- $str = split("\n", $which_text);
+ $str = preg_split('/\n/', $which_text);
$nlines = count($str);
$spacing = $this->line_spacing * ($nlines - 1);
@@ -1480,5 +1480,5 @@
}
- $str = split("\n", $which_title);
+ $str = preg_split('/\n/', $which_title);
$lines = count($str);
$spacing = $this->line_spacing * ($lines - 1);
@@ -1505,5 +1505,5 @@
$this->x_title_txt = $which_xtitle;
- $str = split("\n", $which_xtitle);
+ $str = preg_split('/\n/', $which_xtitle);
$lines = count($str);
$spacing = $this->line_spacing * ($lines - 1);
@@ -1532,5 +1532,5 @@
$this->y_title_txt = $which_ytitle;
- $str = split("\n", $which_ytitle);
+ $str = preg_split('/\n/', $which_ytitle);
$lines = count($str);
$spacing = $this->line_spacing * ($lines - 1);
Index: /trunk/expressoMail1_2/spell_checker/pspell_comp.php
===================================================================
--- /trunk/expressoMail1_2/spell_checker/pspell_comp.php (revision 3400)
+++ /trunk/expressoMail1_2/spell_checker/pspell_comp.php (revision 6057)
@@ -201,5 +201,5 @@
//parse output
- $lines = split("\n",$out);
+ $lines = preg_split('/\n/',$out);
foreach ($lines as $line){
$line = trim($line);
@@ -210,5 +210,5 @@
if($line[0] == '&'){
$line = preg_replace('/&.*?: /','',$line);
- return split(', ',$line);
+ return preg_split('/, /',$line);
}
}
Index: /trunk/expressoMail1_2/spell_checker/spell_checker.php
===================================================================
--- /trunk/expressoMail1_2/spell_checker/spell_checker.php (revision 3400)
+++ /trunk/expressoMail1_2/spell_checker/spell_checker.php (revision 6057)
@@ -197,5 +197,5 @@
//splits the string on any html tags, preserving the tags and putting them in the $words array
- $words = preg_split("/(<[^<>]*>)/", $string, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $words = preg_split('/(<[^<>]*>)/', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
$numResults = count($words); //the number of elements in the array.
@@ -215,5 +215,5 @@
if(($i & 1) == 0) // Even-numbered entries are word sets.
{
- $words[$i] = preg_split("/(\s+|\ )/", $words[$i], -1, PREG_SPLIT_DELIM_CAPTURE); //then split it on the spaces
+ $words[$i] = preg_split('/(\s+|\ )/', $words[$i], -1, PREG_SPLIT_DELIM_CAPTURE); //then split it on the spaces
// Now go through each word and link up the misspelled ones.
Index: /trunk/expressoMail1_2/spell_checker/cpaint/cpaint2.proxy.php
===================================================================
--- /trunk/expressoMail1_2/spell_checker/cpaint/cpaint2.proxy.php (revision 3400)
+++ /trunk/expressoMail1_2/spell_checker/cpaint/cpaint2.proxy.php (revision 6057)
@@ -127,5 +127,5 @@
}
- list($http_headers, $http_body) = split("\r\n\r\n", $http_data, 2);
+ list($http_headers, $http_body) = preg_split('/\r\n\r\n/', $http_data, 2);
echo($http_body);
@fclose($cp_socket);
Index: /trunk/expressoMail1_2/inc/class.ScriptS.inc.php
===================================================================
--- /trunk/expressoMail1_2/inc/class.ScriptS.inc.php (revision 5509)
+++ /trunk/expressoMail1_2/inc/class.ScriptS.inc.php (revision 6057)
@@ -588,5 +588,5 @@
// Recebe o conteúdo do array;
$lines = array();
- $lines = preg_split("/\n/", $scriptName);
+ $lines = preg_split('/\n/', $scriptName);
// Pega o tamanho da regra na primeira do script;
Index: /trunk/expressoMail1_2/inc/class.SieveS.inc.php
===================================================================
--- /trunk/expressoMail1_2/inc/class.SieveS.inc.php (revision 5509)
+++ /trunk/expressoMail1_2/inc/class.SieveS.inc.php (revision 6057)
@@ -77,9 +77,9 @@
elseif (preg_match("/^\"SASL\" +\"(.*)\"/",$said,$bits)) {
$auth_types = $bits[1];
- $this->saslmethods = split(" ", $auth_types);
+ $this->saslmethods = preg_split('/ /', $auth_types);
}
elseif (preg_match("/^\"SIEVE\" +\"(.*)\"/",$said,$bits)) {
$extensions = $bits[1];
- $this->extensions = split(" ", $extensions);
+ $this->extensions = preg_split('/ /', $extensions);
}
elseif (preg_match("/^\"STARTTLS\"/",$said)){
@@ -98,5 +98,5 @@
if (preg_match("/SASL=\{(.+)\}/",$sasl_str,$morebits)) {
$auth_types = $morebits[1];
- $this->saslmethods = split(", ", $auth_types);
+ $this->saslmethods = preg_split('/, /', $auth_types);
}else {
// a bit desperate if we get here.
Index: /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
===================================================================
--- /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php (revision 5864)
+++ /trunk/expressoMail1_2/inc/class.ldap_functions.inc.php (revision 6057)
@@ -212,5 +212,5 @@
$contacts_result[$i] = array();
$contacts_result[$i]["cn"] = $cn;
- list ($contacts_result[$i]["mail"], $contacts_result[$i]["phone"], $contacts_result[$i]["mobile"], $contacts_result[$i]["uid"], $contacts_result[$i]["jpegphoto"], $contacts_result[$i]["employeenumber"], $contacts_result[$i]["ou"]) = split ('%', $info);
+ list ($contacts_result[$i]["mail"], $contacts_result[$i]["phone"], $contacts_result[$i]["mobile"], $contacts_result[$i]["uid"], $contacts_result[$i]["jpegphoto"], $contacts_result[$i]["employeenumber"], $contacts_result[$i]["ou"]) = preg_split('/%/', $info);
$i++;
}
@@ -511,5 +511,5 @@
$extendedinfo=false;
- list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info);
+ list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = preg_split('/%/', $info);
if ($contacts_result['jpegphoto'])