Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
cb41a30b
Commit
cb41a30b
authored
11 years ago
by
Thomas Tanghus
Browse files
Options
Downloads
Patches
Plain Diff
Add Compound property to avoid double escaping values.
parent
fdef2a37
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/vobject/compoundproperty.php
+70
-0
70 additions, 0 deletions
lib/vobject/compoundproperty.php
tests/lib/vobject.php
+19
-0
19 additions, 0 deletions
tests/lib/vobject.php
with
89 additions
and
0 deletions
lib/vobject/compoundproperty.php
0 → 100644
+
70
−
0
View file @
cb41a30b
<?php
/**
* ownCloud - VObject Compound Property
*
* @author Thomas Tanghus
* @author Evert Pot (http://www.rooftopsolutions.nl/)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace
OC\VObject
;
/**
* This class overrides \Sabre\VObject\Property::serialize() to not
* double escape commas and semi-colons in compound properties.
*/
class
CompoundProperty
extends
\Sabre\VObject\Property\Compound
{
/**
* Turns the object back into a serialized blob.
*
* @return string
*/
public
function
serialize
()
{
$str
=
$this
->
name
;
if
(
$this
->
group
)
{
$str
=
$this
->
group
.
'.'
.
$this
->
name
;
}
foreach
(
$this
->
parameters
as
$param
)
{
$str
.
=
';'
.
$param
->
serialize
();
}
$src
=
array
(
"
\n
"
,
);
$out
=
array
(
'\n'
,
);
$str
.
=
':'
.
str_replace
(
$src
,
$out
,
$this
->
value
);
$out
=
''
;
while
(
strlen
(
$str
)
>
0
)
{
if
(
strlen
(
$str
)
>
75
)
{
$out
.
=
mb_strcut
(
$str
,
0
,
75
,
'utf-8'
)
.
"
\r\n
"
;
$str
=
' '
.
mb_strcut
(
$str
,
75
,
strlen
(
$str
),
'utf-8'
);
}
else
{
$out
.
=
$str
.
"
\r\n
"
;
$str
=
''
;
break
;
}
}
return
$out
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
tests/lib/vobject.php
+
19
−
0
View file @
cb41a30b
...
...
@@ -10,10 +10,29 @@ class Test_VObject extends PHPUnit_Framework_TestCase {
public
function
setUp
()
{
Sabre\VObject\Property
::
$classMap
[
'SUMMARY'
]
=
'OC\VObject\StringProperty'
;
Sabre\VObject\Property
::
$classMap
[
'ORG'
]
=
'OC\VObject\CompoundProperty'
;
}
function
testStringProperty
()
{
$property
=
Sabre\VObject\Property
::
create
(
'SUMMARY'
,
'Escape;this,please'
);
$this
->
assertEquals
(
"SUMMARY:Escape\;this\,please
\r\n
"
,
$property
->
serialize
());
}
function
testCompoundProperty
()
{
$arr
=
array
(
'ABC, Inc.'
,
'North American Division'
,
'Marketing;Sales'
,
);
$property
=
Sabre\VObject\Property
::
create
(
'ORG'
);
$property
->
setParts
(
$arr
);
$this
->
assertEquals
(
'ABC\, Inc.;North American Division;Marketing\;Sales'
,
$property
->
value
);
$this
->
assertEquals
(
'ORG:ABC\, Inc.;North American Division;Marketing\;Sales'
.
"
\r\n
"
,
$property
->
serialize
());
$this
->
assertEquals
(
3
,
count
(
$property
->
getParts
()));
$parts
=
$property
->
getParts
();
$this
->
assertEquals
(
'Marketing;Sales'
,
$parts
[
2
]);
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment