[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13964] Syncromind: Merge 13939:13963 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13964] Syncromind: Merge 13939:13963 from trunk |
|
Date: |
Fri, 18 Sep 2015 08:54:18 +0000 |
Revision: 13964
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13964
Author: sigurdne
Date: 2015-09-18 08:54:17 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
Syncromind: Merge 13939:13963 from trunk
Modified Paths:
--------------
branches/dev-syncromind/about.php
branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
branches/dev-syncromind/admin/inc/class.bolog.inc.php
branches/dev-syncromind/admin/inc/class.uiconfig.inc.php
branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/calendar/inc/class.bocalendar.inc.php
branches/dev-syncromind/calendar/inc/class.socalendar.inc.php
branches/dev-syncromind/calendar/inc/class.uicalendar.inc.php
branches/dev-syncromind/catch/inc/class.boconfig.inc.php
branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
branches/dev-syncromind/email/inc/class.mail_msg_display.inc.php
branches/dev-syncromind/email/inc/class.svc_nextmatches.inc.php
branches/dev-syncromind/emailadmin/inc/class.pleskimap.inc.php
branches/dev-syncromind/felamimail/inc/class.Script.inc.php
branches/dev-syncromind/felamimail/inc/class.uisieve.inc.php
branches/dev-syncromind/hrm/inc/class.bocommon.inc.php
branches/dev-syncromind/hrm/inc/class.uicategory.inc.php
branches/dev-syncromind/ipc_test_suite/sources/api/class.vcard.inc.php
branches/dev-syncromind/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
branches/dev-syncromind/phpgwapi/inc/class.asyncservice.inc.php
branches/dev-syncromind/phpgwapi/inc/class.jscal.inc.php
branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
branches/dev-syncromind/phpgwapi/inc/class.send.inc.php
branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php
branches/dev-syncromind/phpgwapi/inc/class.sql_builder.inc.php
branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php
branches/dev-syncromind/phpgwapi/inc/wiki2html/textile/Textile.php
branches/dev-syncromind/phpgwapi/js/uploadify/uploadify.php
branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
branches/dev-syncromind/property/inc/class.interlink.inc.php
branches/dev-syncromind/property/inc/cron/default/catch_ppc.php
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh
branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
branches/dev-syncromind/rental/inc/model/class.contract.inc.php
branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/fn.php
branches/dev-syncromind/sms/inc/plugin/gateway/uplink/fn.php
branches/dev-syncromind/soap.php
branches/dev-syncromind/todo/inc/class.uitodo.inc.php
branches/dev-syncromind/xmlrpc.php
Property Changed:
----------------
branches/dev-syncromind/
branches/dev-syncromind/booking/
branches/dev-syncromind/bookingfrontend/
branches/dev-syncromind/controller/
Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791,13793-13800,13802-13811,13816-13880,13882-13931,13934
+ /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791,13793-13800,13802-13811,13816-13880,13882-13931,13934,13940-13963
Modified: branches/dev-syncromind/about.php
===================================================================
--- branches/dev-syncromind/about.php 2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/about.php 2015-09-18 08:54:17 UTC (rev 13964)
@@ -93,7 +93,7 @@
if (is_array($infos))
{
$names =
explode('<br />',$infos['name']);
- $emails =
split('@|<br />',$infos['email']);
+ $emails =
preg_split('/@|<br \/>/',$infos['email']);
if
(count($names) < count($emails)/2)
{
$names
= '';
Modified: branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
===================================================================
--- branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/addressbook/inc/class.boXport.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -133,7 +133,7 @@
while ($data = fgets($fp,8000))
{
$url = "";
- list($name,$value,$extra) = split(':',
$data);
+ list($name,$value,$extra) =
preg_split('/:/', $data);
if (substr($name,0,2) == 'dn')
{
$buffer =
$contacts->import_start_record($buffer);
@@ -156,7 +156,7 @@
if ($name && $value)
{
- $test = split(',mail=',$value);
+ $test =
preg_split('/,mail=/',$value);
if ($test[1])
{
$name = "mail";
Modified: branches/dev-syncromind/admin/inc/class.bolog.inc.php
===================================================================
--- branches/dev-syncromind/admin/inc/class.bolog.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/admin/inc/class.bolog.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -42,7 +42,7 @@
if (
preg_match('/@/',$record['log_account_lid']))
{
- $t =
split('@',$record['log_account_lid']);
+ $t =
preg_split('/@/',$record['log_account_lid']);
$record['log_account_lid'] = $t[0];
}
Modified: branches/dev-syncromind/admin/inc/class.uiconfig.inc.php
===================================================================
--- branches/dev-syncromind/admin/inc/class.uiconfig.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/admin/inc/class.uiconfig.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -211,7 +211,7 @@
break;
case 'checked':
/* '+' is used as a
delimiter for the check value */
- list($newvalue,$check)
= split('\+',$newval);
+ list($newvalue,$check)
= preg_split('/\+/',$newval);
$newval =
preg_replace('/ /','_',$newvalue);
if($current_config[$newval] == $check)
{
Property changes on: branches/dev-syncromind/booking
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,13179-13344,13434-13481,13778-13791,13816-13880,13882-13931
+ /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,13179-13344,13434-13481,13778-13791,13816-13880,13882-13931,13940-13963
Modified: branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/booking/inc/class.uibuilding.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -36,7 +36,7 @@
public function properties()
{
$q = phpgw::get_var('query', 'str', 'REQUEST', null);
- $type_id = count(split('-', $q));
+ $type_id = count(explode('-', $q));
$so = CreateObject('property.solocation');
$ret = $so->read(array('type_id' => $type_id,
'location_code'=>$q));
foreach($ret as &$r)
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -425,8 +425,8 @@
$event['to_'] = $checkdate['to_'];
$_POST['to_'] = $checkdate['to_'];
list($event, $errors) =
$this->extract_and_validate($event);
- $time_from = split(" ",$_POST['from_']);
- $time_to = split(" ",$_POST['to_']);
+ $time_from = explode("
",$_POST['from_']);
+ $time_to = explode(" ",$_POST['to_']);
if ($time_from[0] == $time_to[0])
{
if ($time_from[1] >=
$time_to[1])
@@ -443,8 +443,8 @@
else
{
list($event, $errors) =
$this->extract_and_validate($event);
- $time_from = split(" ",$_POST['from_']);
- $time_to = split(" ",$_POST['to_']);
+ $time_from = explode(" ",$_POST['from_']);
+ $time_to = explode(" ",$_POST['to_']);
if ($time_from[0] == $time_to[0]) {
if ($time_from[1] >= $time_to[1])
{
Property changes on: branches/dev-syncromind/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875,12986
/trunk/bookingfrontend:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,13346-13399,13434-13481
+ /branches/stavangerkommune/bookingfrontend:9468-12740,12743-12875,12986
/trunk/bookingfrontend:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,13346-13399,13434-13481,13940-13963
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -101,8 +101,8 @@
#The string replace is a workaround for a problem at Bergen
Kommune
$booking['from_'] = str_replace('%3A',':',phpgw::get_var('from_',
'str', 'GET'));
$booking['to_'] = str_replace('%3A',':',phpgw::get_var('to_',
'str', 'GET'));
- $time_from = split(" ",phpgw::get_var('from_', 'str',
'GET'));
- $time_to = split(" ",phpgw::get_var('to_', 'str',
'GET'));
+ $time_from = explode(" ",phpgw::get_var('from_', 'str',
'GET'));
+ $time_to = explode(" ",phpgw::get_var('to_', 'str',
'GET'));
$step = phpgw::get_var('step', 'str', 'POST');
if (! isset($step)) $step = 1;
Modified: branches/dev-syncromind/calendar/inc/class.bocalendar.inc.php
===================================================================
--- branches/dev-syncromind/calendar/inc/class.bocalendar.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/calendar/inc/class.bocalendar.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -2564,7 +2564,7 @@
$details['startdate'] =
$GLOBALS['phpgw']->common->show_date($starttime);
$details['enddate'] =
$GLOBALS['phpgw']->common->show_date($endtime);
- list($subject,$body) =
split("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);
+ list($subject,$body) =
explode("\n",$GLOBALS['phpgw']->preferences->parse_notify($notify_msg,$details),2);
$subject =
trim($send->encode_subject($subject));
switch($part_prefs['calendar']['update_format'])
{
Modified: branches/dev-syncromind/calendar/inc/class.socalendar.inc.php
===================================================================
--- branches/dev-syncromind/calendar/inc/class.socalendar.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/calendar/inc/class.socalendar.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -147,7 +147,7 @@
$sql = 'AND (phpgw_cal_user.cal_login IN
('.implode(',',$members).')) AND '.
'(phpgw_cal_user.cal_login='.intval($this->owner).' OR phpgw_cal.is_public=1)
AND (';
- $words = split(' ',$keywords);
+ $words = explode(' ',$keywords);
foreach($words as $i => $word)
{
$sql .= $i > 0 ? ' OR ' : '';
Modified: branches/dev-syncromind/calendar/inc/class.uicalendar.inc.php
===================================================================
--- branches/dev-syncromind/calendar/inc/class.uicalendar.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/calendar/inc/class.uicalendar.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -2298,7 +2298,7 @@
$params = explode('&', $params);
foreach( $params as $v )
{
- $b = split('=', $v);
+ $b = explode('=', $v);
if(isset($b[0]) && $b[0])
{
$new_params[$b[0]] = $b[1];
Modified: branches/dev-syncromind/catch/inc/class.boconfig.inc.php
===================================================================
--- branches/dev-syncromind/catch/inc/class.boconfig.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/catch/inc/class.boconfig.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -88,7 +88,7 @@
foreach ($config_info as & $entry)
{
- list($entity_id, $cat_id) = split('[_]',
$entry['schema']);
+ list($entity_id, $cat_id) = preg_split('/[_]/',
$entry['schema']);
$category =
$entity->read_single_category($entity_id, $cat_id);
$entry['schema'] = "{$entry['schema']}
{$category['name']}";
}
@@ -101,7 +101,7 @@
$values =
$this->so->read_single_type($id);
$entity =
CreateObject('property.soadmin_entity');
$entity->type = 'catch';
- list($entity_id, $cat_id) = split('[_]',
$values['schema']);
+ list($entity_id, $cat_id) = preg_split('/[_]/',
$values['schema']);
$category =
$entity->read_single_category($entity_id, $cat_id);
$values['schema_text'] = "{$values['schema']}
{$category['name']}";
return $values;
Property changes on: branches/dev-syncromind/controller
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/stavangerkommune/controller:12743-12875,12986
/trunk/controller:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13728-13729,13731-13773,13802-13811,13816-13880,13882-13931
+ /branches/stavangerkommune/controller:12743-12875,12986
/trunk/controller:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13728-13729,13731-13773,13802-13811,13816-13880,13882-13931,13940-13963
Modified: branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/controller/inc/class.uicheck_list.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -1522,7 +1522,7 @@
$from =
str_replace(array('[',']'),array('<','>'),$from_address);
- $from_array = split('<', $from);
+ $from_array = explode('<', $from);
unset($from);
if ( count($from_array) == 2 )
{
Modified: branches/dev-syncromind/email/inc/class.mail_msg_display.inc.php
===================================================================
--- branches/dev-syncromind/email/inc/class.mail_msg_display.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/email/inc/class.mail_msg_display.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -2352,7 +2352,7 @@
}
$newText = '';
- $lines = split("\n",$data);
+ $lines = explode("\n",$data);
while ( list ($key,$line) = each ($lines))
{
Modified: branches/dev-syncromind/email/inc/class.svc_nextmatches.inc.php
===================================================================
--- branches/dev-syncromind/email/inc/class.svc_nextmatches.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/email/inc/class.svc_nextmatches.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -83,7 +83,7 @@
$extra = explode('&', $extra);
foreach( $extra as $v )
{
- $b = split('=', $v);
+ $b = explode('=', $v);
if(isset($b[0]) && $b[0])
{
$new_extra[$b[0]] = $b[1];
@@ -197,7 +197,7 @@
$extravar = explode('&', $extravar);
foreach( $extravar as $v )
{
- $b = split('=', $v);
+ $b = explode('=', $v);
if(isset($b[0]) && $b[0])
{
$new_extravar[$b[0]] = $b[1];
Modified: branches/dev-syncromind/emailadmin/inc/class.pleskimap.inc.php
===================================================================
--- branches/dev-syncromind/emailadmin/inc/class.pleskimap.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/emailadmin/inc/class.pleskimap.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -423,7 +423,7 @@
while(!feof($fp))
{
$line = trim(fgets($fp));
- list($name,$value) = split(': *',$line,2);
+ list($name,$value) = preg_split('/: */',$line,2);
if (!is_null($value) && strpos($name,'An error
occured') === false && $name)
{
$values[$name] = $value;
Modified: branches/dev-syncromind/felamimail/inc/class.Script.inc.php
===================================================================
--- branches/dev-syncromind/felamimail/inc/class.Script.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/felamimail/inc/class.Script.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -380,7 +380,7 @@
$if[] = 'address :contains
["To","TO","Cc","CC"] "'.$addr.'"';
}
$newscriptbody .= 'if anyof
('.implode(', ',$if).") {\n";
- foreach(split(',
?',$vacation['forwards']) as $addr) {
+ foreach(preg_split('/,
?/',$vacation['forwards']) as $addr) {
$newscriptbody .= "\tredirect
\"".$addr."\";\n";
}
$newscriptbody .= "\tkeep;\n}\n";
Modified: branches/dev-syncromind/felamimail/inc/class.uisieve.inc.php
===================================================================
--- branches/dev-syncromind/felamimail/inc/class.uisieve.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/felamimail/inc/class.uisieve.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -260,7 +260,7 @@
if ($_vacation['forwards'])
{
- foreach(split(', ?',$_vacation['forwards']) as
$addr)
+ foreach(preg_split('/,
?/',$_vacation['forwards']) as $addr)
{
if (!preg_match($regexp,$addr))
{
Modified: branches/dev-syncromind/hrm/inc/class.bocommon.inc.php
===================================================================
--- branches/dev-syncromind/hrm/inc/class.bocommon.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/hrm/inc/class.bocommon.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -120,8 +120,8 @@
{
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $fields = split('[./-]',$datestr);
- foreach(split('[./-]',$dateformat) as $n => $field)
+ $fields = preg_split('/[.\/-]/',$datestr);
+ foreach(preg_split('/[.\/-]/',$dateformat) as $n =>
$field)
{
$date[$field] = intval($fields[$n]);
Modified: branches/dev-syncromind/hrm/inc/class.uicategory.inc.php
===================================================================
--- branches/dev-syncromind/hrm/inc/class.uicategory.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/hrm/inc/class.uicategory.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -77,7 +77,7 @@
while (is_array($category_list) && list(,$category) =
each($category_list))
{
- $words = split(' ',$category['descr']);
+ $words = explode(' ',$category['descr']);
$first = "$words[0] $words[1] $words[2]
$words[3]";
$content[] = array
Modified: branches/dev-syncromind/ipc_test_suite/sources/api/class.vcard.inc.php
===================================================================
--- branches/dev-syncromind/ipc_test_suite/sources/api/class.vcard.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/ipc_test_suite/sources/api/class.vcard.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -174,7 +174,7 @@
/* Following is a lot of pain and little magic */
while ( list($name,$value) = @each($buffer) )
{
- $field = split(';',$name);
+ $field = explode(';',$name);
while (list($key,$val) = each($field))
{
@@ -185,7 +185,7 @@
$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 = explode(';',$value);
switch ($field[0])
{
case 'N':
@@ -207,7 +207,7 @@
}
break;
case 'FN':
- $fn = split(" ", $values[0], 3);
+ $fn = explode(" ", $values[0], 3);
switch (count($fn))
{
case 1:
@@ -479,7 +479,7 @@
}
}
- 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
$entry['address2'] = $street[1];
Modified:
branches/dev-syncromind/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
===================================================================
---
branches/dev-syncromind/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++
branches/dev-syncromind/ipc_test_suite/sources/app/class.ipc_addressbook.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -627,7 +627,7 @@
$add_parts =
explode(',', utf8_decode($data[$attribute][0]));
for($k=0;$k<count($add_parts);++$k)
{
- list($name,
$value) = split('=', $add_parts[$k], 2);
+ list($name,
$value) = explode('=', $add_parts[$k], 2);
$value =
utf8_decode($value);
switch(strtolower($name))
{
@@ -690,7 +690,7 @@
$add_parts =
explode(';', utf8_decode($data[$attribute][0]));
for($k=0;$k<count($add_parts);++$k)
{
- list($name,
$value) = split('=', $add_parts[$k], 2);
+ list($name,
$value) = explode('=', $add_parts[$k], 2);
switch(strtolower($name))
{
case
'c':
Modified: branches/dev-syncromind/phpgwapi/inc/class.asyncservice.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.asyncservice.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/class.asyncservice.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -655,7 +655,7 @@
while ($line = fgets($crontab,256))
{
if ($this->debug) echo 'line '.++$n.":
$line<br>\n";
- $parts = split(' ',$line,6);
+ $parts = explode(' ',$line,6);
if ($line[0] == '#' || count($parts) <
6 || ($parts[5][0] != '/' && substr($parts[5],0,3) != 'php'))
{
Modified: branches/dev-syncromind/phpgwapi/inc/class.jscal.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.jscal.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/class.jscal.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -177,8 +177,8 @@
{
return False;
}
- $fields = split('[./-]',$datestr);
- foreach(split('[./-]',$this->dateformat) as $n =>
$field)
+ $fields = preg_split('/[.\/-]/',$datestr);
+ foreach(preg_split('/[.\/-]/',$this->dateformat) as $n
=> $field)
{
$date[$field] = intval($fields[$n]);
if($field == 'M')
Modified: branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/class.net_http_client.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -722,7 +722,7 @@
if( $this->debug & DBGINDATA ) echo "HEADER :
$str;";
$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]) )
$headers[$hdr] .= "; " .
trim($value);
Modified: branches/dev-syncromind/phpgwapi/inc/class.send.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.send.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/class.send.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -71,7 +71,7 @@
{
$mail = createObject('phpgwapi.mailer_smtp');
$from =
str_replace(array('[',']'),array('<','>'),$from);
- $from_array = split('<', $from);
+ $from_array = explode('<', $from);
unset($from);
if ( count($from_array) == 2 )
{
@@ -89,7 +89,7 @@
foreach ($to as $entry)
{
$entry =
str_replace(array('[',']'),array('<','>'),$entry);
- $to_array = split('<', $entry);
+ $to_array = explode('<', $entry);
if ( count($to_array) == 2 )
{
$mail->AddAddress(trim($to_array[1],'>'), $to_array[0]);
@@ -108,7 +108,7 @@
foreach ($cc as $entry)
{
$entry =
str_replace(array('[',']'),array('<','>'),$entry);
- $cc_array = split('<', $entry);
+ $cc_array = explode('<', $entry);
if ( count($cc_array) == 2 )
{
$mail->AddCC(trim($cc_array[1],'>'), $cc_array[0]);
@@ -127,7 +127,7 @@
foreach ($bcc as $entry)
{
$entry =
str_replace(array('[',']'),array('<','>'),$entry);
- $bcc_array = split('<', $entry);
+ $bcc_array = explode('<', $entry);
if ( count($bcc_array) == 2 )
{
$mail->AddBCC(trim($bcc_array[1],'>'), $bcc_array[0]);
Modified: branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/class.setup.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -229,17 +229,17 @@
function checkip($remoteip='')
{
- $allowed_ips =
split(',',$GLOBALS['phpgw_info']['server']['setup_acl']);
+ $allowed_ips =
explode(',',$GLOBALS['phpgw_info']['server']['setup_acl']);
if(is_array($allowed_ips))
{
$foundip = False;
while(list(,$value) = @each($allowed_ips))
{
- $test = split("\.",$value);
+ $test = preg_split("/\./",$value);
if(count($test) < 3)
{
$value .= ".0.0";
- $tmp = split("\.",$remoteip);
+ $tmp =
preg_split("/\./",$remoteip);
$tmp[2] = 0;
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
@@ -247,14 +247,14 @@
elseif(count($test) < 4)
{
$value .= ".0";
- $tmp = split("\.",$remoteip);
+ $tmp =
preg_split("/\./",$remoteip);
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
}
elseif(count($test) == 4 &&
intval($test[3]) == 0)
{
- $tmp = split("\.",$remoteip);
+ $tmp =
preg_split("/\./",$remoteip);
$tmp[3] = 0;
$testremoteip = join('.',$tmp);
}
Modified: branches/dev-syncromind/phpgwapi/inc/class.sql_builder.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.sql_builder.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/class.sql_builder.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -789,7 +789,7 @@
elseif(is_string($data))
{
$this->ldebug('criteria', 'Query a string is',
'msg');
- list($field, $filter) = split ('=',
str_replace(' ', '', $data));
+ list($field, $filter) = explode('=',
str_replace(' ', '', $data));
$ent = $this->get_entity($field);
$this->entities[$ent]->add_criteria($field,
$filter);
}
Modified: branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/class.vcard.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -174,7 +174,7 @@
/* Following is a lot of pain and little magic */
while ( list($name,$value) = @each($buffer) )
{
- $field = split(';',$name);
+ $field = explode(';',$name);
while (list($key,$val) = each($field))
{
@@ -185,7 +185,7 @@
$field[0] = str_replace("B\.",'',$field[0]);
$field[0] = str_replace("C\.",'',$field[0]);
$field[0] = str_replace("D\.",'',$field[0]);
- $values = split(';',$value);
+ $values = explode(';',$value);
switch ($field[0])
{
case 'N':
@@ -207,7 +207,7 @@
}
break;
case 'FN':
- $fn = split(" ", $values[0], 3);
+ $fn = explode(" ", $values[0], 3);
switch (count($fn))
{
case 1:
@@ -479,7 +479,7 @@
}
}
- 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
$entry['address2'] = $street[1];
Modified: branches/dev-syncromind/phpgwapi/inc/wiki2html/textile/Textile.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/wiki2html/textile/Textile.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/inc/wiki2html/textile/Textile.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -609,7 +609,7 @@
$o = '';
if( $style ) {
foreach($style as $s) {
- $parts = split(';', $s);
+ $parts = explode(';', $s);
foreach( $parts as $p ) {
$p = trim($p, '; ');
if( !empty( $p ) )
Modified: branches/dev-syncromind/phpgwapi/js/uploadify/uploadify.php
===================================================================
--- branches/dev-syncromind/phpgwapi/js/uploadify/uploadify.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/phpgwapi/js/uploadify/uploadify.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -32,7 +32,7 @@
// $fileTypes = str_replace('*.','',$_REQUEST['fileext']);
// $fileTypes = str_replace(';','|',$fileTypes);
- // $typesArray = split('\|',$fileTypes);
+ // $typesArray = preg_split('/\|/',$fileTypes);
// $fileParts = pathinfo($_FILES['Filedata']['name']);
// if (in_array($fileParts['extension'],$typesArray)) {
@@ -45,4 +45,3 @@
// echo 'Invalid file type.';
// }
}
-?>
Modified: branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
===================================================================
--- branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/preferences/inc/class.boadmin_acl.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -248,7 +248,7 @@
$totalacl = array();
foreach ( $values as $rowinfo => $perm )
{
- list($user_id,$rights) = split('_', $rowinfo);
+ list($user_id,$rights) = explode('_', $rowinfo);
if ( !isset($totalacl[$user_id]) )
{
Modified: branches/dev-syncromind/property/inc/class.interlink.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.interlink.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/property/inc/class.interlink.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -168,7 +168,6 @@
$location =
ltrim($location, '.');
$parts =
explode('.', $location);
- // list($type, $entity_id,
$cat_id) = split('[.]', $location);
$this->boadmin_entity->type = $parts[0];
switch($parts[0])
{
Modified: branches/dev-syncromind/property/inc/cron/default/catch_ppc.php
===================================================================
--- branches/dev-syncromind/property/inc/cron/default/catch_ppc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/property/inc/cron/default/catch_ppc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -77,7 +77,7 @@
$this->pickup_path =
$config_data['pickup_path'];
$target =
$config_data['target'];
$target_table = "fm_catch_{$target}";
- list($entity_id, $cat_id) = split('[_]',
$target);
+ list($entity_id, $cat_id) = preg_split('/[_]/',
$target);
$this->category_dir =
"catch_{$entity_id}_{$cat_id}";
$category =
$admin_entity->read_single_category($entity_id, $cat_id);
$schema_text = "{$target}
{$category['name']}";
Modified:
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh
===================================================================
---
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh
2015-09-18 00:16:12 UTC (rev 13963)
+++
branches/dev-syncromind/property/tutorials/property/examples/install.apache.sh
2015-09-18 08:54:17 UTC (rev 13964)
@@ -1,12 +1,12 @@
#!/bin/bash
-# $Id$
+# $Id$
#/**
-# * installscript for APACHE with PHP, IMAP, POSTGRESQL, MYSQL, LIBXML, XSLT,
FREEDTS(MSSQL) and EACCELERATOR
-# *
-# *
+# * installscript for APACHE with PHP, IMAP, POSTGRESQL, MYSQL, LIBXML, XSLT,
FREEDTS(MSSQL), PCRE, APR, APR-UTIL
+# *
+# *
# * Download all tarballs to one directory(here: '/opt/web') and place this
script in the same place
-# *
+# *
# * NOTE: Do not add spaces after bash variables.
# *
# * @author Sigurd Nes <Sigurdne (inside) online (dot) no>
@@ -17,14 +17,24 @@
# should be edited
##############################
+#PCRE from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+PCRETAR="pcre-8.36.tar.gz"
+PCRE="pcre-8.36"
+
+#APR from http://apr.apache.org/
+APRTAR="apr-1.5.2.tar.gz"
+APR="apr-1.5.2"
+APR_UTIL_TAR="apr-util-1.5.4.tar.gz"
+APR_UTIL="apr-util-1.5.4"
+
#/**
# * Name of the freetds package e.g freetds-stable.tgz
-# *
+# *
# * @var string FREETDS, FREETDSTAR
# * Download: http://www.freetds.org/software.html
# */
-FREETDSTAR="freetds-stable.tgz"
-FREETDS="freetds-0.91"
+FREETDSTAR="freetds-patched.tar.gz"
+FREETDS="freetds-0.95.19"
# Download: http://xmlsoft.org/downloads.html
LIBXMLTAR="libxml2-2.9.2.tar.gz"
@@ -41,36 +51,24 @@
#/**
# * Name of the APACHE tarball e.g httpd-2.2.6.tar.gz
-# *
+# *
# * @var string APACHE, APACHETAR
# * Download: http://php.net/
# */
-APACHETAR="httpd-2.2.21.tar.gz"
-APACHE="httpd-2.2.21"
+APACHETAR="httpd-2.4.16.tar.gz"
+APACHE="httpd-2.4.16"
#/**
# * Name of the PHP tarball e.g php-5.2.tar.gz
-# *
+# *
# * @var string PHP, PHPTAR
# * Download: http://httpd.apache.org/
# */
-PHPTAR="php-5.3.8.tar.bz2"
-PHP="php-5.3.8"
+PHPTAR="php-7.0.0RC2.tar.bz2"
+PHP="php-7.0.0RC2"
-#/**
-# * Name of the EACCELERATOR tarball e.g eaccelerator-0.9.5.tar.bz2
-# *
-# * @var string EACCELERATOR, EACCELERATORTAR
-# * Download: http://eaccelerator.net/
-# */
-EACCELERATORTAR="eaccelerator-0.9.6.1.tar.bz2"
-EACCELERATOR="eaccelerator-0.9.6.1"
PHP_PREFIX="/usr/local"
-# APC as Alternative:
-# Download: http://pecl.php.net/package/APC
-# APCTAR="APC-3.1.2.tgz"
-# APC="APC-3.1.2"
#/**
# * Oracle PDO-Support
@@ -81,9 +79,9 @@
#ORACLE="instantclient_11_2"
#ORACLEDEVELTAR="instantclient-sdk-linux32-11.2.0.1.zip"
-ORACLETAR="instantclient-basic-linux-x86-64-11.2.0.2.0.zip"
-ORACLE="instantclient_11_2"
-ORACLEDEVELTAR="instantclient-sdk-linux-x86-64-11.2.0.2.0.zip"
+ORACLETAR="instantclient-basic-linux.x64-12.1.0.2.0.zip"
+ORACLE="instantclient_12_1"
+ORACLEDEVELTAR="instantclient-sdk-linux.x64-12.1.0.2.0.zip"
ORACLE_PDO=""
@@ -103,17 +101,17 @@
unzip $1
mv $2 /opt/
- unzip $ORACLEDEVELTAR
+ unzip $ORACLEDEVELTAR
mv $2/sdk /opt/$2/
export ORACLE_HOME=/opt/$2/
- ln -s /opt/$2/libclntsh.so.11.1 /opt/$2/libclntsh.so
- ln -s /opt/$2/libocci.so.11.1 /opt/$2/libocci.so
+ ln -s /opt/$2/libclntsh.so.12.1 /opt/$2/libclntsh.so
+ ln -s /opt/$2/libocci.so.12.1 /opt/$2/libocci.so
ln -s /opt/$2/ /opt/$2/lib
}
# clean up from previous
-
+rm $PCRE -rf &&\
rm $FREETDS -rf &&\
rm $LIBXML -rf &&\
rm $LIBXSL -rf &&\
@@ -196,16 +194,23 @@
echo "Skipping MSSQL"
fi
-
+tar -xzf $APRTAR &&\
+tar -xzf $APR_UTIL_TAR &&\
+tar -xzf $PCRETAR &&\
tar -xzf $LIBXMLTAR &&\
tar -xzf $LIBXSLTAR &&\
tar -xzf $APACHETAR &&\
bunzip2 -c $PHPTAR | tar xvf -&&\
-bunzip2 -c $EACCELERATORTAR | tar xvf -&&\
-cd $LIBXML &&\
+mv $APR $APACHE/srclib/apr &&\
+mv $APR_UTIL $APACHE/srclib/apr-util &&\
+cd $PCRE &&\
./configure &&\
make &&\
make install &&\
+cd ../$LIBXML &&\
+./configure &&\
+make &&\
+make install &&\
cd ../$LIBXSL &&\
./configure &&\
make &&\
@@ -261,20 +266,43 @@
--enable-zip \
$ORACLE_PDO &&\
make &&\
-make install &&\
-cd ../$EACCELERATOR &&\
-$PHP_PREFIX/bin/phpize &&\
-./configure --enable-eaccelerator=shared
--with-php-config=$PHP_PREFIX/bin/php-config &&\
-make &&\
-make install &&\
-mkdir /tmp/eaccelerator &&\
-chmod 0777 /tmp/eaccelerator
+make install
-#cd ../$APC &&\
-#$PHP_PREFIX/bin/phpize &&\
-#./configure --enable-apc-mmap --with-apxs
--with-php-config=$PHP_PREFIX/bin/php-config &&\
-#make &&\
-#make install
-# vim: set expandtab :
+#export LDFLAGS=-lstdc++ &&\
+#./configure \
+# --with-sybase-ct=/usr/local/freetds\
+# --with-apxs2=/usr/local/apache2/bin/apxs\
+# --with-xsl\
+# --with-zlib\
+# --with-pspell\
+# --with-jpeg-dir=/usr/lib\
+# --with-png-dir=/usr/lib\
+# --with-freetype-dir=/usr/lib\
+# --with-gd\
+# --enable-ftp\
+# --with-pgsql\
+# --with-mysql\
+# --with-mysqli\
+# --enable-shmop\
+# --enable-sysvsem\
+# --enable-sysvshm\
+# --enable-calendar\
+# --enable-pdo\
+# --with-pdo-sqlite\
+# --with-sqlite\
+# --with-pdo-pgsql\
+# --with-pdo-mysql\
+# --with-openssl\
+# --enable-mbstring\
+# --with-mcrypt\
+# --enable-soap\
+# --with-xmlrpc \
+# --with-gettext \
+# --with-snmp \
+# --with-curl \
+# --enable-zip \
+# --with-oci8=instantclient,/opt/instantclient_12_1/ --with-pdo-oci
+
+# vim: set expandtab :
\ No newline at end of file
Modified: branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/rental/inc/class.bofellesdata.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -579,7 +579,7 @@
$selector = "";
switch($search_type){
case 'unit_leader':
- $search_words = split('
', $search_for);
+ $search_words =
explode(' ', $search_for);
$count = 0;
$selector = "(";
foreach($search_words
as $search_word){
@@ -719,7 +719,7 @@
$selector = "";
switch($search_type){
case 'unit_leader':
- $search_words = split('
', $search_for);
+ $search_words =
explode(' ', $search_for);
$count = 0;
$selector = "(";
foreach($search_words
as $search_word)
Modified: branches/dev-syncromind/rental/inc/model/class.contract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/model/class.contract.inc.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/rental/inc/model/class.contract.inc.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -689,13 +689,13 @@
$date_end = phpgw::get_var('date_end');
if(isset($date_start)){
- $aDate = split ("/", $date_start);
+ $aDate = explode("/", $date_start);
$date_start =
$aDate[1]."/".$aDate[0]."/".$aDate[2];
$timestamp_invoice_start =
strtotime($date_start);
}
if(isset($date_end)){
- $aDate = split ("/", $date_end);
+ $aDate = explode("/", $date_end);
$date_end =
$aDate[1]."/".$aDate[0]."/".$aDate[2];
$timestamp_invoice_end = strtotime($date_end);
}
Modified: branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/fn.php
===================================================================
--- branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/fn.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/sms/inc/plugin/gateway/clickatell/fn.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -19,7 +19,7 @@
$fd = @implode ('', file ($url));
if ($fd)
{
- $response = split (" ", $fd);
+ $response = explode(" ", $fd);
$err_code = trim ($response[1]);
$credit = 0;
if ((strtoupper(trim($response[2])) == "CHARGE:"))
@@ -149,7 +149,7 @@
setsmsdeliverystatus($smslog_id,$uid,$p_status);
if ($fd)
{
- $response = split (":", $fd);
+ $response = explode(":", $fd);
$err_code = trim ($response[1]);
if ((strtoupper($response[0]) == "ID"))
{
Modified: branches/dev-syncromind/sms/inc/plugin/gateway/uplink/fn.php
===================================================================
--- branches/dev-syncromind/sms/inc/plugin/gateway/uplink/fn.php
2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/sms/inc/plugin/gateway/uplink/fn.php
2015-09-18 08:54:17 UTC (rev 13964)
@@ -53,7 +53,7 @@
$fd = @implode ('', file ($url));
if ($fd)
{
- $response = split (" ", $fd);
+ $response = explode(" ", $fd);
if ($response[0] == "OK")
{
$remote_slid = $response[1];
Modified: branches/dev-syncromind/soap.php
===================================================================
--- branches/dev-syncromind/soap.php 2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/soap.php 2015-09-18 08:54:17 UTC (rev 13964)
@@ -77,7 +77,7 @@
$tmp = str_replace(' ','',$tmp);
$tmp = str_replace('Basic','',$tmp);
$auth = base64_decode(trim($tmp));
- list($login,$password) = split(':',$auth);
+ list($login,$password) = explode(':',$auth);
if($GLOBALS['phpgw']->session->create($login, $password))
{
Modified: branches/dev-syncromind/todo/inc/class.uitodo.inc.php
===================================================================
--- branches/dev-syncromind/todo/inc/class.uitodo.inc.php 2015-09-18
00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/todo/inc/class.uitodo.inc.php 2015-09-18
08:54:17 UTC (rev 13964)
@@ -191,7 +191,7 @@
if (!$title)
{
- $words = split('
',$GLOBALS['phpgw']->strip_html($todo_list[$i]['descr']));
+ $words = explode('
',$GLOBALS['phpgw']->strip_html($todo_list[$i]['descr']));
$title = "$words[0] $words[1] $words[2]
$words[3] ...";
}
@@ -385,7 +385,7 @@
}
if (! $todo['title'])
{
- $words = split('
',$GLOBALS['phpgw']->strip_html($todo['descr']));
+ $words = explode('
',$GLOBALS['phpgw']->strip_html($todo['descr']));
$title = "$words[0] $words[1] $words[2]
$words[3] ...";
$todo_select .= ">$title";
}
Modified: branches/dev-syncromind/xmlrpc.php
===================================================================
--- branches/dev-syncromind/xmlrpc.php 2015-09-18 00:16:12 UTC (rev 13963)
+++ branches/dev-syncromind/xmlrpc.php 2015-09-18 08:54:17 UTC (rev 13964)
@@ -139,7 +139,7 @@
$tmp = str_replace(' ','',$tmp);
$tmp = str_replace('Basic','',$tmp);
$auth = base64_decode(trim($tmp));
- list($login,$password) = split(':',$auth);
+ list($login,$password) = explode(':',$auth);
if($GLOBALS['phpgw']->session->create($login, $password))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13964] Syncromind: Merge 13939:13963 from trunk,
Sigurd Nes <=